LGTM, thanks.
On Mon, Dec 2, 2013 at 8:47 PM, Klaus Aehlig <[email protected]> wrote: > For disk sizes, instead of plain numbers (naming the value in MiB), > also accept expressions with units like 'GiB'. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > src/Ganeti/OpParams.hs | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/src/Ganeti/OpParams.hs b/src/Ganeti/OpParams.hs > index aa360a0..f697ea8 100644 > --- a/src/Ganeti/OpParams.hs > +++ b/src/Ganeti/OpParams.hs > @@ -265,6 +265,7 @@ import Text.JSON.Pretty (pp_value) > import Ganeti.BasicTypes > import qualified Ganeti.Constants as C > import Ganeti.THH > +import Ganeti.Utils > import Ganeti.JSON > import Ganeti.Types > import qualified Ganeti.Query.Language as Qlang > @@ -342,9 +343,10 @@ $(buildObject "INicParams" "inic" > , optionalField $ simpleField C.inicBridge [t| NonEmptyString |] > ]) > > --- | Disk modification definition. FIXME: disksize should be VTYPE_UNIT. > +-- | Disk modification definition. > $(buildObject "IDiskParams" "idisk" > - [ optionalField $ simpleField C.idiskSize [t| Int |] > + [ specialNumericalField 'parseUnitLarge . optionalField > + $ simpleField C.idiskSize [t| Int |] > , optionalField $ simpleField C.idiskMode [t| DiskAccess |] > , optionalField $ simpleField C.idiskAdopt [t| NonEmptyString |] > , optionalField $ simpleField C.idiskVg [t| NonEmptyString |] > -- > 1.8.4.1 > >
