A few unittests improvements

[ganeti-local] / htools / Ganeti / HTools / Simu.hs

diff --git a/htools/Ganeti/HTools/Simu.hs b/htools/Ganeti/HTools/Simu.hs
index 890eae1..4600f12 100644 (file)
--- a/htools/Ganeti/HTools/Simu.hs
+++ b/htools/Ganeti/HTools/Simu.hs
@@ -30,10 +30,11 @@ module Ganeti.HTools.Simu
   , parseData
   ) where
 
-import Control.Monad (mplus)
+import Control.Monad (mplus, zipWithM)
 import Text.Printf (printf)
 
-import Ganeti.HTools.Utils
+import Ganeti.BasicTypes
+import Ganeti.Utils
 import Ganeti.HTools.Types
 import Ganeti.HTools.Loader
 import qualified Ganeti.HTools.Container as Container
@@ -83,14 +84,14 @@ createGroup grpIndex spec = do
                            (fromIntegral cpu) False spindles grpIndex
                   ) [1..ncount]
       grp = Group.create (printf "group-%02d" grpIndex)
-            (printf "fake-uuid-%02d" grpIndex) apol defIPolicy
+            (printf "fake-uuid-%02d" grpIndex) apol defIPolicy []
   return (Group.setIdx grp grpIndex, nodes)
 
 -- | Builds the cluster data from node\/instance files.
 parseData :: [String] -- ^ Cluster description in text format
           -> Result ClusterData
 parseData ndata = do
-  grpNodeData <- mapM (uncurry createGroup) $ zip [1..] ndata
+  grpNodeData <- zipWithM createGroup [1..] ndata
   let (groups, nodes) = unzip grpNodeData
       nodes' = concat nodes
   let ktn = map (\(idx, n) -> (idx, Node.setIdx n idx))