On Fri, Apr 12, 2013 at 10:34 AM, Klaus Aehlig <[email protected]> wrote:
> The test data for hail allocating a multi-disk instance was > originially added in the 2.7 branch. On master the format > Fix the typo on "originally" . 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 <[email protected]> > --- > test/data/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 3558256..790de2a 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 abf7221..2a4f636 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": { > -- > 1.8.1.3 > > Rest LGTM. No need to resend. Thanks, Michele
