Merge branch 'stable-2.8' into stable-2.9

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

diff --git a/test/data/htools/hail-alloc-drbd.json b/test/data/htools/hail-alloc-drbd.json
index f650fbe..6e926d5 100644 (file)
--- a/test/data/htools/hail-alloc-drbd.json
+++ b/test/data/htools/hail-alloc-drbd.json
@@ -14,24 +14,26 @@
           "cpu-count": 1,
           "spindle-use": 1
         },
-        "minmax": {
-         "min": {
-           "nic-count": 1,
-           "disk-size": 128,
-           "disk-count": 1,
-           "memory-size": 128,
-           "cpu-count": 1,
-           "spindle-use": 1
-         },
-         "max": {
-           "nic-count": 8,
-           "disk-size": 1048576,
-           "disk-count": 16,
-           "memory-size": 32768,
-           "cpu-count": 8,
-           "spindle-use": 8
-         }
-        },
+        "minmax": [
+          {
+            "min": {
+              "nic-count": 1,
+              "disk-size": 128,
+              "disk-count": 1,
+              "memory-size": 128,
+              "cpu-count": 1,
+              "spindle-use": 1
+            },
+            "max": {
+              "nic-count": 8,
+              "disk-size": 1048576,
+              "disk-count": 16,
+              "memory-size": 32768,
+              "cpu-count": 8,
+              "spindle-use": 8
+            }
+          }
+        ],
         "vcpu-ratio": 4.0,
         "disk-templates": [
           "sharedfile",
@@ -44,6 +46,7 @@
         ],
         "spindle-ratio": 32.0
       },
+      "networks": [],
       "alloc_policy": "preferred",
       "tags": [],
       "name": "default"
@@ -58,22 +61,26 @@
       "disk-count": 1,
       "spindle-use": 1
     },
-    "min": {
-      "nic-count": 1,
-      "disk-size": 1024,
-      "memory-size": 128,
-      "cpu-count": 1,
-      "disk-count": 1,
-      "spindle-use": 1
-    },
-    "max": {
-      "nic-count": 8,
-      "disk-size": 1048576,
-      "memory-size": 32768,
-      "cpu-count": 8,
-      "disk-count": 16,
-      "spindle-use": 8
-    },
+    "minmax": [
+      {
+        "min": {
+          "nic-count": 1,
+          "disk-size": 1024,
+          "memory-size": 128,
+          "cpu-count": 1,
+          "disk-count": 1,
+          "spindle-use": 1
+        },
+        "max": {
+          "nic-count": 8,
+          "disk-size": 1048576,
+          "memory-size": 32768,
+          "cpu-count": 8,
+          "disk-count": 16,
+          "spindle-use": 8
+        }
+      }
+    ],
     "vcpu-ratio": 4.0,
     "disk-templates": [
       "sharedfile",
@@ -95,6 +102,7 @@
     "instance14": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 128
         }
@@ -125,6 +133,7 @@
     "instance13": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 512
         }
@@ -154,6 +163,7 @@
     "instance18": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 128
         }
@@ -183,6 +193,7 @@
     "instance19": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 128
         }
@@ -213,6 +224,7 @@
     "instance2": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 128
         }
@@ -243,10 +255,12 @@
     "instance3": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 256
         },
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 128
         }
@@ -276,6 +290,7 @@
     "instance4": {
       "disks": [
         {
+          "spindles": 2,
           "mode": "rw",
           "size": 2048
         }
@@ -306,6 +321,7 @@
     "instance8": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 256
         }
@@ -335,6 +351,7 @@
     "instance9": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 128
         }
@@ -367,6 +384,7 @@
     "instance20": {
       "disks": [
         {
+          "spindles": 1,
           "mode": "rw",
           "size": 512
         }
@@ -407,15 +425,19 @@
       "free_memory": 31389,
       "ndparams": {
         "spindle_count": 1,
-        "oob_program": null
+        "oob_program": null,
+        "exclusive_storage": false
       },
       "reserved_memory": 1017,
+      "reserved_cpus": 1,
       "master_capable": true,
       "free_disk": 1377280,
       "drained": false,
       "total_memory": 32763,
       "primary_ip": "192.168.1.1",
       "i_pri_memory": 0,
+      "free_spindles": 12,
+      "total_spindles": 12,
       "vm_capable": true,
       "offline": false
     },
@@ -430,15 +452,19 @@
       "free_memory": 31746,
       "ndparams": {
         "spindle_count": 1,
-        "oob_program": null
+        "oob_program": null,
+        "exclusive_storage": false
       },
       "reserved_memory": 1017,
+      "reserved_cpus": 1,
       "master_capable": true,
       "free_disk": 1376640,
       "drained": false,
       "total_memory": 32763,
       "primary_ip": "192.168.1.2",
       "i_pri_memory": 0,
+      "free_spindles": 12,
+      "total_spindles": 12,
       "vm_capable": true,
       "offline": false
     },
@@ -453,15 +479,19 @@
       "free_memory": 31234,
       "ndparams": {
         "spindle_count": 1,
-        "oob_program": null
+        "oob_program": null,
+        "exclusive_storage": false
       },
       "reserved_memory": 1017,
+      "reserved_cpus": 1,
       "master_capable": true,
       "free_disk": 1373336,
       "drained": false,
       "total_memory": 32763,
       "primary_ip": "192.168.1.3",
       "i_pri_memory": 2432,
+      "free_spindles": 6,
+      "total_spindles": 12,
       "vm_capable": true,
       "offline": false
     },
@@ -476,15 +506,19 @@
       "free_memory": 22914,
       "ndparams": {
         "spindle_count": 1,
-        "oob_program": null
+        "oob_program": null,
+        "exclusive_storage": false
       },
       "reserved_memory": 1017,
+      "reserved_cpus": 1,
       "master_capable": true,
       "free_disk": 1371520,
       "drained": false,
       "total_memory": 32763,
       "primary_ip": "192.168.1.4",
       "i_pri_memory": 23552,
+      "free_spindles": 0,
+      "total_spindles": 12,
       "vm_capable": true,
       "offline": false
     }
@@ -492,6 +526,7 @@
   "request": {
     "disks": [
       {
+        "spindles": 1,
         "mode": "rw",
         "size": 1024
       }