Hs2Py constants: add 'ndcDefaults'

Add constant 'ndcDefaults' to the Haskell to Python constant
generation.

Signed-off-by: Jose A. Lopes <jabolopes@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

diff --git a/lib/constants.py b/lib/constants.py
index 6aaddba..bbd6944 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -1281,15 +1281,7 @@ HVC_GLOBALS = _constants.HVC_GLOBALS
 
 BEC_DEFAULTS = _constants.BEC_DEFAULTS
 
-NDC_DEFAULTS = {
-  ND_OOB_PROGRAM: "",
-  ND_SPINDLE_COUNT: 1,
-  ND_EXCLUSIVE_STORAGE: False,
-  ND_OVS: False,
-  ND_OVS_NAME: DEFAULT_OVS,
-  ND_OVS_LINK: ""
-  }
-
+NDC_DEFAULTS = _constants.NDC_DEFAULTS
 NDC_GLOBALS = _constants.NDC_GLOBALS
 
 DISK_LD_DEFAULTS = {

diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs
index 6128346..e8afeae 100644 (file)
--- a/src/Ganeti/HsConstants.hs
+++ b/src/Ganeti/HsConstants.hs
@@ -3468,6 +3468,17 @@ becDefaults =
   , (beSpindleUse, PyValueEx (1 :: Int))
   ]
 
+ndcDefaults :: Map String PyValueEx
+ndcDefaults =
+  Map.fromList
+  [ (ndOobProgram,       PyValueEx "")
+  , (ndSpindleCount,     PyValueEx (1 :: Int))
+  , (ndExclusiveStorage, PyValueEx False)
+  , (ndOvs,              PyValueEx False)
+  , (ndOvsName,          PyValueEx defaultOvs)
+  , (ndOvsLink,          PyValueEx "")
+  ]
+
 ndcGlobals :: FrozenSet String
 ndcGlobals = ConstantUtils.mkSet [ndExclusiveStorage]