LGTM, thanks.
On Mon, Oct 7, 2013 at 4:38 PM, Jose A. Lopes <[email protected]> wrote: > Add 'hvcGlobals' and 'ndcGlobals' to the Haskell to Python constant > generation. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > lib/constants.py | 11 ++--------- > src/Ganeti/HsConstants.hs | 10 ++++++++++ > 2 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/lib/constants.py b/lib/constants.py > index 29a4040..536459e 100644 > --- a/lib/constants.py > +++ b/lib/constants.py > @@ -1333,12 +1333,7 @@ HVC_DEFAULTS = { > }, > } > > -HVC_GLOBALS = compat.UniqueFrozenset([ > - HV_MIGRATION_PORT, > - HV_MIGRATION_BANDWIDTH, > - HV_MIGRATION_MODE, > - HV_XEN_CMD, > - ]) > +HVC_GLOBALS = _constants.HVC_GLOBALS > > BEC_DEFAULTS = { > BE_MINMEM: 128, > @@ -1358,9 +1353,7 @@ NDC_DEFAULTS = { > ND_OVS_LINK: "" > } > > -NDC_GLOBALS = compat.UniqueFrozenset([ > - ND_EXCLUSIVE_STORAGE, > - ]) > +NDC_GLOBALS = _constants.NDC_GLOBALS > > DISK_LD_DEFAULTS = { > DT_DRBD8: { > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index ad495ab..fa962c8 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -3418,6 +3418,16 @@ ssFilePerms = 0o444 > defaultEnabledHypervisor :: String > defaultEnabledHypervisor = htXenPvm > > +hvcGlobals :: FrozenSet String > +hvcGlobals = > + ConstantUtils.mkSet [hvMigrationBandwidth, > + hvMigrationMode, > + hvMigrationPort, > + hvXenCmd] > + > +ndcGlobals :: FrozenSet String > +ndcGlobals = ConstantUtils.mkSet [ndExclusiveStorage] > + > -- * Confd > > confdProtocolVersion :: Int > -- > 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
