projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e4614a7
..
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,
"drained": false,
"free_disk": 1377280,
"free_memory": 31389,
+ "free_spindles": 12,
"group": "uuid-group-1",
"ndparams": {
"group": "uuid-group-1",
"ndparams": {
- "spindle_count": 1
+ "spindle_count": 1,
+ "exclusive_storage": false
},
"offline": false,
"reserved_memory": 1017,
},
"offline": false,
"reserved_memory": 1017,
+ "reserved_cpus": 1,
"total_cpus": 4,
"total_disk": 1377280,
"total_cpus": 4,
"total_disk": 1377280,
- "total_memory": 32763
+ "total_memory": 32763,
+ "total_spindles": 12
}
},
"request": {
}
},
"request": {
@@
-73,9
+77,11
@@
"disk_template": "file",
"disks": [
{
"disk_template": "file",
"disks": [
{
+ "spindles": 1,
"size": 1536
},
{
"size": 1536
},
{
+ "spindles": 1,
"size": 1536
}
],
"size": 1536
}
],
@@
-85,7
+91,8
@@
"spindle_use": 2,
"tags": [],
"type": "allocate",
"spindle_use": 2,
"tags": [],
"type": "allocate",
- "vcpus": 1
+ "vcpus": 1,
+ "nics": []
},
"version": 2
}
},
"version": 2
}