Revision 07e68848 src/Ganeti/Constants.hs

b/src/Ganeti/Constants.hs
42 42
import qualified Data.Map as Map (empty, fromList, keys, insert)
43 43

  
44 44
import qualified AutoConf
45
import Ganeti.ConstantUtils (PythonChar(..), PythonNone(..), FrozenSet,
46
                             Protocol(..), buildVersion)
45
import Ganeti.ConstantUtils (PythonChar(..), FrozenSet, Protocol(..),
46
                             buildVersion)
47 47
import qualified Ganeti.ConstantUtils as ConstantUtils
48 48
import Ganeti.HTools.Types (AutoRepairResult(..), AutoRepairType(..))
49 49
import qualified Ganeti.HTools.Types as Types
......
600 600
valueFalse :: String
601 601
valueFalse = "false"
602 602

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

  
606 603
-- * Hooks
607 604

  
608 605
hooksNameCfgupdate :: String
......
2249 2246
nicsParameterTypes =
2250 2247
  Map.fromList [(nicMode, vtypeString),
2251 2248
                (nicLink, vtypeString),
2252
                (nicVlan, vtypeMaybeString)]
2249
                (nicVlan, vtypeString)]
2253 2250

  
2254 2251
nicsParameters :: FrozenSet String
2255 2252
nicsParameters = ConstantUtils.mkSet (Map.keys nicsParameterTypes)
......
3795 3792
  Map.fromList
3796 3793
  [ (nicMode, PyValueEx nicModeBridged)
3797 3794
  , (nicLink, PyValueEx defaultBridge)
3798
  , (nicVlan, PyValueEx valueHsNothing)
3795
  , (nicVlan, PyValueEx "")
3799 3796
  ]
3800 3797

  
3801 3798
-- | All of the following values are quite arbitrary - there are no

Also available in: Unified diff