Add type synonyms for the node/instance indices

[ganeti-local] / Ganeti / HTools / Text.hs

diff --git a/Ganeti/HTools/Text.hs b/Ganeti/HTools/Text.hs
index f643e5f..19826cc 100644 (file)
--- a/Ganeti/HTools/Text.hs
+++ b/Ganeti/HTools/Text.hs
@@ -1,7 +1,7 @@
 {-| Parsing data from text-files
 
 This module holds the code for loading the cluster state from text
-files, as produced by gnt-node/gnt-instance list.
+files, as produced by gnt-node and gnt-instance list.
 
 -}
 
@@ -12,6 +12,7 @@ import Control.Monad
 
 import Ganeti.HTools.Utils
 import Ganeti.HTools.Loader
+import Ganeti.HTools.Types
 import qualified Ganeti.HTools.Node as Node
 import qualified Ganeti.HTools.Instance as Instance
 
@@ -30,20 +31,20 @@ loadNode :: (Monad m) => [String] -> m (String, Node.Node)
 loadNode (name:tm:nm:fm:td:fd:fo:[]) = do
   new_node <-
       if any (== "?") [tm,nm,fm,td,fd] || fo == "Y" then
-          return $ Node.create 0 0 0 0 0 True
+          return $ Node.create name 0 0 0 0 0 True
       else do
         vtm <- tryRead name tm
         vnm <- tryRead name nm
         vfm <- tryRead name fm
         vtd <- tryRead name td
         vfd <- tryRead name fd
-        return $ Node.create vtm vnm vfm vtd vfd False
+        return $ Node.create name vtm vnm vfm vtd vfd False
   return (name, new_node)
 loadNode s = fail $ "Invalid/incomplete node data: '" ++ (show s) ++ "'"
 
 -- | Load an instance from a field list
 loadInst :: (Monad m) =>
-            [(String, Int)] -> [String] -> m (String, Instance.Instance)
+            [(String, Ndx)] -> [String] -> m (String, Instance.Instance)
 loadInst ktn (name:mem:dsk:status:pnode:snode:[]) = do
   pidx <- lookupNode ktn name pnode
   sidx <- (if null snode then return Node.noSecondary
@@ -52,7 +53,7 @@ loadInst ktn (name:mem:dsk:status:pnode:snode:[]) = do
   vdsk <- tryRead name dsk
   when (sidx == pidx) $ fail $ "Instance " ++ name ++
            " has same primary and secondary node - " ++ pnode
-  let newinst = Instance.create vmem vdsk status pidx sidx
+  let newinst = Instance.create name vmem vdsk status pidx sidx
   return (name, newinst)
 loadInst _ s = fail $ "Invalid/incomplete instance data: '" ++ (show s) ++ "'"
 
@@ -63,24 +64,24 @@ This function converts a text in tabular format as generated by
 supplied conversion function.
 
 -}
-loadTabular :: (Monad m) => String -> ([String] -> m (String, a))
-            -> (a -> Int -> a) -> m ([(String, Int)], [(Int, a)])
-loadTabular text_data convert_fn set_fn = do
+loadTabular :: (Monad m, Element a) =>
+               String -> ([String] -> m (String, a))
+            -> m ([(String, Int)], [(Int, a)])
+loadTabular text_data convert_fn = do
   let lines_data = lines text_data
       rows = map (sepSplit '|') lines_data
   kerows <- mapM convert_fn rows
-  return $ assignIndices set_fn kerows
+  return $ assignIndices kerows
 
 loadData :: String -- ^ Node data in string format
          -> String -- ^ Instance data in string format
-         -> IO (Result (NameAssoc, Node.AssocList,
-                        NameAssoc, Instance.AssocList))
+         -> IO (Result (Node.AssocList, Instance.AssocList))
 loadData nfile ifile = do -- IO monad
   ndata <- readFile nfile
   idata <- readFile ifile
   return $ do
     {- node file: name t_mem n_mem f_mem t_disk f_disk -}
-    (ktn, nl) <- loadTabular ndata loadNode Node.setIdx
+    (ktn, nl) <- loadTabular ndata loadNode
     {- instance file: name mem disk status pnode snode -}
-    (kti, il) <- loadTabular idata (loadInst ktn) Instance.setIdx
-    return (ktn, nl, kti, il)
+    (_, il) <- loadTabular idata (loadInst ktn)
+    return (nl, il)