Merge 'EvacNode' and 'NodeEvacMode'

[ganeti-local] / lib / ht.py

diff --git a/lib/ht.py b/lib/ht.py
index f028139..d6171ac 100644 (file)
--- a/lib/ht.py
+++ b/lib/ht.py
@@ -537,7 +537,7 @@ TExportMode = TElemOf(constants.EXPORT_MODES)
 TDiskIndex = TAnd(TNonNegativeInt, lambda val: val < constants.MAX_DISKS)
 TReplaceDisksMode = TElemOf(constants.REPLACE_MODES)
 TDiskTemplate = TElemOf(constants.DISK_TEMPLATES)
-TNodeEvacMode = TElemOf(constants.IALLOCATOR_NEVAC_MODES)
+TEvacMode = TElemOf(constants.NODE_EVAC_MODES)
 TIAllocatorTestDir = TElemOf(constants.VALID_IALLOCATOR_DIRECTIONS)
 TIAllocatorMode = TElemOf(constants.VALID_IALLOCATOR_MODES)
 
@@ -567,7 +567,7 @@ def TSetParamsMods(fn):
 
 TINicParams = \
     Comment("NIC parameters")(TDictOf(TElemOf(constants.INIC_PARAMS),
-                                      TMaybeString))
+                                      TMaybe(TString)))
 
 TIDiskParams = \
     Comment("Disk parameters")(TDictOf(TElemOf(constants.IDISK_PARAMS),