Revision a2b55ccd

b/lib/constants.py
203 203
IEIO_RAW_DISK = _constants.IEIO_RAW_DISK
204 204
IEIO_SCRIPT = _constants.IEIO_SCRIPT
205 205

  
206
VALUE_DEFAULT = "default"
207
VALUE_AUTO = "auto"
208
VALUE_GENERATE = "generate"
209
VALUE_NONE = "none"
210
VALUE_TRUE = "true"
211
VALUE_FALSE = "false"
212
VALUE_HS_NOTHING = {"Nothing": None}
213

  
206
VALUE_DEFAULT = _constants.VALUE_DEFAULT
207
VALUE_AUTO = _constants.VALUE_AUTO
208
VALUE_GENERATE = _constants.VALUE_GENERATE
209
VALUE_NONE = _constants.VALUE_NONE
210
VALUE_TRUE = _constants.VALUE_TRUE
211
VALUE_FALSE = _constants.VALUE_FALSE
212
VALUE_HS_NOTHING = _constants.VALUE_HS_NOTHING
214 213

  
215 214
# External script validation mask
216 215
EXT_PLUGIN_MASK = re.compile("^[a-zA-Z0-9_-]+$")
......
1325 1324
# we don't want to export the shortcuts
1326 1325
del _LV_DEFAULTS, _DRBD_DEFAULTS
1327 1326

  
1328
NICC_DEFAULTS = {
1329
  NIC_MODE: NIC_MODE_BRIDGED,
1330
  NIC_LINK: DEFAULT_BRIDGE,
1331
  NIC_VLAN: VALUE_HS_NOTHING,
1332
  }
1333

  
1327
NICC_DEFAULTS = _constants.NICC_DEFAULTS
1334 1328
ISPECS_MINMAX_DEFAULTS = _constants.ISPECS_MINMAX_DEFAULTS
1335 1329
IPOLICY_DEFAULTS = _constants.IPOLICY_DEFAULTS
1336 1330

  
b/src/Ganeti/ConstantUtils.hs
42 42
instance PyValue PythonChar where
43 43
  showValue c = "chr(" ++ show (ord (unPythonChar c)) ++ ")"
44 44

  
45
-- | 'PythonNone' wraps Python 'None'
46
data PythonNone = PythonNone
47

  
48
instance PyValue PythonNone where
49
  showValue _ = "None"
50

  
45 51
-- | FrozenSet wraps a Haskell 'Set'
46 52
--
47 53
-- See 'PyValue' instance for 'FrozenSet'.
b/src/Ganeti/HsConstants.hs
43 43
import qualified Data.Map as Map (empty, fromList, keys, insert)
44 44

  
45 45
import qualified AutoConf
46
import Ganeti.ConstantUtils (PythonChar(..), FrozenSet, Protocol(..),
47
                             buildVersion)
46
import Ganeti.ConstantUtils (PythonChar(..), PythonNone(..), FrozenSet,
47
                             Protocol(..), buildVersion)
48 48
import qualified Ganeti.ConstantUtils as ConstantUtils
49 49
import Ganeti.HTools.Types (AutoRepairResult(..), AutoRepairType(..))
50 50
import qualified Ganeti.HTools.Types as Types
......
581 581
ieioScript :: String
582 582
ieioScript = "script"
583 583

  
584
-- * Values
585

  
586
valueDefault :: String
587
valueDefault = "default"
588

  
589
valueAuto :: String
590
valueAuto = "auto"
591

  
592
valueGenerate :: String
593
valueGenerate = "generate"
594

  
595
valueNone :: String
596
valueNone = "none"
597

  
598
valueTrue :: String
599
valueTrue = "true"
600

  
601
valueFalse :: String
602
valueFalse = "false"
603

  
604
valueHsNothing :: Map String PythonNone
605
valueHsNothing = Map.fromList [("Nothing", PythonNone)]
606

  
584 607
-- * Hooks
585 608

  
586 609
hooksNameCfgupdate :: String
......
3517 3540
  , (DTExt, Map.empty)
3518 3541
  ]
3519 3542

  
3543
niccDefaults :: Map String PyValueEx
3544
niccDefaults =
3545
  Map.fromList
3546
  [ (nicMode, PyValueEx nicModeBridged)
3547
  , (nicLink, PyValueEx defaultBridge)
3548
  , (nicVlan, PyValueEx valueHsNothing)
3549
  ]
3550

  
3520 3551
-- | All of the following values are quite arbitrary - there are no
3521 3552
-- "good" defaults, these must be customised per-site
3522 3553
ispecsMinmaxDefaults :: Map String (Map String Int)

Also available in: Unified diff