LGTM, thanks On Thu, Apr 2, 2015 at 11:00 AM, 'Klaus Aehlig' via ganeti-devel < [email protected]> wrote:
> > commit fa4f489c7d4cfc3de98bd500e9b9404a3cae8a83 > Merge: 0503112 6af5421 > Author: Klaus Aehlig <[email protected]> > Date: Thu Apr 2 10:48:35 2015 +0200 > > Merge branch 'stable-2.13' into stable-2.14 > > * stable-2.13 > (no changes) > > * stable-2.12 > Add default values for hv_state_static and disk_state_static > Add a value for the empty Container > Verify if we're master before demoting > Also consider connection time out a network error > > * stable-2.11 > (no changes) > > * stable-2.10 > Fixed typos > Pass correct params in move-instance > In CanTieredAlloc test set IPolicy > Make genInstanceMaybeBiggerThanNode honor policy lower bound > Also export a null ISpec > Support instance generation within ranges > Add a function to leave the list monad > > Conflicts: > test/hs/Test/Ganeti/HTools/Instance.hs (trivial) > > Signed-off-by: Klaus Aehlig <[email protected]> > > diff --cc test/hs/Test/Ganeti/HTools/Instance.hs > index 70421df,db75429..190bfc2 > --- a/test/hs/Test/Ganeti/HTools/Instance.hs > +++ b/test/hs/Test/Ganeti/HTools/Instance.hs > @@@ -72,16 -75,20 +75,21 @@@ genInstanceWithin min_mem min_dsk min_c > run_st <- arbitrary > pn <- arbitrary > sn <- arbitrary > - vcpus <- choose (0, lim_cpu) > + vcpus <- choose (min_cpu, max_cpu) > dt <- arbitrary > - spindles <- case lim_spin of > - Nothing -> genMaybe $ choose (0, maxSpindles) > - Just ls -> liftM Just $ choose (0, ls) > + spindles <- case max_spin of > + Nothing -> genMaybe $ choose (min_spin, maxSpindles) > + Just ls -> liftM Just $ choose (min_spin, ls) > + forthcoming <- arbitrary > let disk = Instance.Disk dsk spindles > return $ Instance.create > - name mem dsk [disk] vcpus run_st [] True pn sn dt 1 [] > + name mem dsk [disk] vcpus run_st [] True pn sn dt 1 [] forthcoming > > + -- | Generate an instance with maximum disk/mem/cpu values. > + genInstanceSmallerThan :: Int -> Int -> Int -> Maybe Int > + -> Gen Instance.Instance > + genInstanceSmallerThan = genInstanceWithin 0 0 0 0 > + > -- | Generates an instance smaller than a node. > genInstanceSmallerThanNode :: Node.Node -> Gen Instance.Instance > genInstanceSmallerThanNode node = > > > -- > Klaus Aehlig > Google Germany GmbH, Dienerstr. 12, 80331 Muenchen > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
