LGTM, thanks.
On Mon, Oct 7, 2013 at 4:37 PM, Jose A. Lopes <[email protected]> wrote: > Add constant 'fileDriver' to the Haskell to Python constant > generation. The constant 'FILE_DRIVER' is also moved to the > appropriate place in 'lib/constants.py'. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > lib/constants.py | 3 +-- > src/Ganeti/HsConstants.hs | 5 +++++ > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/lib/constants.py b/lib/constants.py > index 412b996..ca99f07 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -502,9 +502,9 @@ DRBD_VALID_BARRIER_OPT = compat.UniqueFrozenset([ > # rbd tool command > RBD_CMD = "rbd" > > -# file backend driver > FD_BLKTAP = _constants.FD_BLKTAP > FD_LOOP = _constants.FD_LOOP > +FILE_DRIVER = _constants.FILE_DRIVER > > LDS_DRBD = _constants.LDS_DRBD > > @@ -552,7 +552,6 @@ RIE_CONNECT_RETRIES = 10 > #: Give child process up to 5 seconds to exit after sending a signal > CHILD_LINGER_TIMEOUT = 5.0 > > -FILE_DRIVER = compat.UniqueFrozenset([FD_LOOP, FD_BLKTAP]) > > # import/export config options > INISECT_EXP = "export" > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index fdcacd0..5e5b243 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -519,6 +519,11 @@ fdBlktap = Types.fileDriverToRaw FileBlktap > fdLoop :: String > fdLoop = Types.fileDriverToRaw FileLoop > > +fileDriver :: FrozenSet String > +fileDriver = > + ConstantUtils.mkSet $ > + map Types.fileDriverToRaw [minBound..] > + > -- | The set of drbd-like disk types > ldsDrbd :: FrozenSet String > ldsDrbd = ConstantUtils.mkSet [Types.diskTemplateToRaw DTDrbd8] > -- > 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
