LGTM, thanks.
On Mon, Oct 7, 2013 at 4:37 PM, Jose A. Lopes <[email protected]> wrote: > Move 'VType' related constants to the appropriate place to match > Python's constants module. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > src/Ganeti/HsConstants.hs | 34 ++++++++++++++++++++-------------- > 1 file changed, 20 insertions(+), 14 deletions(-) > > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index 8a100ea..ccb1825 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -775,6 +775,26 @@ rpcTmo_1day = Types.rpcTimeoutToRaw OneDay > rpcConnectTimeout :: Int > rpcConnectTimeout = 5 > > +-- * VTypes > + > +vtypeBool :: VType > +vtypeBool = VTypeBool > + > +vtypeInt :: VType > +vtypeInt = VTypeInt > + > +vtypeMaybeString :: VType > +vtypeMaybeString = VTypeMaybeString > + > +-- | Size in MiBs > +vtypeSize :: VType > +vtypeSize = VTypeSize > + > +vtypeString :: VType > +vtypeString = VTypeString > + > +enforceableTypes :: FrozenSet VType > +enforceableTypes = ConstantUtils.mkSet [minBound..] > > -- | Instance specs > -- > @@ -913,26 +933,12 @@ instanceRebootFull = Types.rebootTypeToRaw RebootFull > rebootTypes :: FrozenSet String > rebootTypes = ConstantUtils.mkSet $ map Types.rebootTypeToRaw [minBound..] > > --- * VTypes > > -vtypeBool :: String > -vtypeBool = Types.vTypeToRaw VTypeBool > > -vtypeInt :: String > -vtypeInt = Types.vTypeToRaw VTypeInt > > -vtypeMaybeString :: String > -vtypeMaybeString = Types.vTypeToRaw VTypeMaybeString > > --- | Size in MiBs > -vtypeSize :: String > -vtypeSize = Types.vTypeToRaw VTypeSize > > -vtypeString :: String > -vtypeString = Types.vTypeToRaw VTypeString > > -enforceableTypes :: FrozenSet String > -enforceableTypes = ConstantUtils.mkSet $ map Types.vTypeToRaw [minBound..] > > -- * OOB supported commands > > -- > 1.8.4 > > -- Thomas Thrainer | Software Engineer | [email protected] | 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
