Revision 3a715da0

b/lib/constants.py
313 313
DRBD_B_DISK_DRAIN = _constants.DRBD_B_DISK_DRAIN
314 314
DRBD_B_DISK_FLUSH = _constants.DRBD_B_DISK_FLUSH
315 315

  
316
# Valid barrier combinations: "n" or any non-null subset of "bfd"
317
DRBD_VALID_BARRIER_OPT = compat.UniqueFrozenset([
318
  frozenset([DRBD_B_NONE]),
319
  frozenset([DRBD_B_DISK_BARRIERS]),
320
  frozenset([DRBD_B_DISK_DRAIN]),
321
  frozenset([DRBD_B_DISK_FLUSH]),
322
  frozenset([DRBD_B_DISK_DRAIN, DRBD_B_DISK_FLUSH]),
323
  frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_DRAIN]),
324
  frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_FLUSH]),
325
  frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_FLUSH, DRBD_B_DISK_DRAIN]),
326
  ])
316
DRBD_VALID_BARRIER_OPT = _constants.DRBD_VALID_BARRIER_OPT
327 317

  
328 318
RBD_CMD = _constants.RBD_CMD
329 319

  
b/src/Ganeti/ConstantUtils.hs
46 46
--
47 47
-- See 'PyValue' instance for 'FrozenSet'.
48 48
newtype FrozenSet a = FrozenSet { unFrozenSet :: Set a }
49
  deriving (Eq, Show)
49
  deriving (Eq, Ord, Show)
50 50

  
51 51
-- | Converts a Haskell 'Set' into a Python 'frozenset'
52 52
--
b/src/Ganeti/HsConstants.hs
904 904
drbdBNone :: String
905 905
drbdBNone = "n"
906 906

  
907
-- | Valid barrier combinations: "n" or any non-null subset of "bfd"
908
drbdValidBarrierOpt :: FrozenSet (FrozenSet String)
909
drbdValidBarrierOpt =
910
  ConstantUtils.mkSet
911
  [ ConstantUtils.mkSet [drbdBNone]
912
  , ConstantUtils.mkSet [drbdBDiskBarriers]
913
  , ConstantUtils.mkSet [drbdBDiskDrain]
914
  , ConstantUtils.mkSet [drbdBDiskFlush]
915
  , ConstantUtils.mkSet [drbdBDiskDrain, drbdBDiskFlush]
916
  , ConstantUtils.mkSet [drbdBDiskBarriers, drbdBDiskDrain]
917
  , ConstantUtils.mkSet [drbdBDiskBarriers, drbdBDiskFlush]
918
  , ConstantUtils.mkSet [drbdBDiskBarriers, drbdBDiskFlush, drbdBDiskDrain]
919
  ]
920

  
907 921
-- | Rbd tool command
908 922
rbdCmd :: String
909 923
rbdCmd = "rbd"

Also available in: Unified diff