Commit b0ef4593 authored by Klaus Aehlig's avatar Klaus Aehlig
Browse files

Adapt test data to changed ipolicy format



The test data for hail allocating a multi-disk instance was
originally added in the 2.7 branch. On master the format
of the ipolicy had changed; "min" and "max" are no longer
top-level of the ipolicy, but instead below the "minmax"
key. Hence change the test data accordingly after the merge
to master.
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent 738a803a
...@@ -16,21 +16,23 @@ ...@@ -16,21 +16,23 @@
"disk-templates": [ "disk-templates": [
"file" "file"
], ],
"max": { "minmax" : {
"cpu-count": 2, "max": {
"disk-count": 8, "cpu-count": 2,
"disk-size": 2048, "disk-count": 8,
"memory-size": 12800, "disk-size": 2048,
"nic-count": 8, "memory-size": 12800,
"spindle-use": 8 "nic-count": 8,
}, "spindle-use": 8
"min": { },
"cpu-count": 1, "min": {
"disk-count": 1, "cpu-count": 1,
"disk-size": 1024, "disk-count": 1,
"memory-size": 128, "disk-size": 1024,
"nic-count": 1, "memory-size": 128,
"spindle-use": 1 "nic-count": 1,
"spindle-use": 1
}
}, },
"spindle-ratio": 32.0, "spindle-ratio": 32.0,
"std": { "std": {
......
...@@ -16,21 +16,23 @@ ...@@ -16,21 +16,23 @@
"disk-templates": [ "disk-templates": [
"file" "file"
], ],
"max": { "minmax": {
"cpu-count": 2, "max": {
"disk-count": 8, "cpu-count": 2,
"disk-size": 2048, "disk-count": 8,
"memory-size": 12800, "disk-size": 2048,
"nic-count": 8, "memory-size": 12800,
"spindle-use": 8 "nic-count": 8,
}, "spindle-use": 8
"min": { },
"cpu-count": 1, "min": {
"disk-count": 1, "cpu-count": 1,
"disk-size": 1024, "disk-count": 1,
"memory-size": 128, "disk-size": 1024,
"nic-count": 1, "memory-size": 128,
"spindle-use": 1 "nic-count": 1,
"spindle-use": 1
}
}, },
"spindle-ratio": 32.0, "spindle-ratio": 32.0,
"std": { "std": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment