From b0ef45930a70bad7ccb18b05010209df1e759de1 Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <aehlig@google.com>
Date: Fri, 12 Apr 2013 09:57:49 +0200
Subject: [PATCH] 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: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>
---
.../htools/hail-alloc-invalid-twodisks.json | 32 ++++++++++---------
test/data/htools/hail-alloc-twodisks.json | 32 ++++++++++---------
2 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/test/data/htools/hail-alloc-invalid-twodisks.json b/test/data/htools/hail-alloc-invalid-twodisks.json
index 355825666..790de2a54 100644
--- a/test/data/htools/hail-alloc-invalid-twodisks.json
+++ b/test/data/htools/hail-alloc-invalid-twodisks.json
@@ -16,21 +16,23 @@
"disk-templates": [
"file"
],
- "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": {
diff --git a/test/data/htools/hail-alloc-twodisks.json b/test/data/htools/hail-alloc-twodisks.json
index abf722141..2a4f63686 100644
--- a/test/data/htools/hail-alloc-twodisks.json
+++ b/test/data/htools/hail-alloc-twodisks.json
@@ -16,21 +16,23 @@
"disk-templates": [
"file"
],
- "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": {
--
GitLab