Small whitespace change

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

diff --git a/Ganeti/HTools/Rapi.hs b/Ganeti/HTools/Rapi.hs
index 58540e1..28d2684 100644 (file)
--- a/Ganeti/HTools/Rapi.hs
+++ b/Ganeti/HTools/Rapi.hs
@@ -21,7 +21,7 @@ import Ganeti.HTools.Types
 import qualified Ganeti.HTools.Node as Node
 import qualified Ganeti.HTools.Instance as Instance
 
--- | Read an URL via curl and return the body if successful
+-- | Read an URL via curl and return the body if successful.
 getUrl :: (Monad m) => String -> IO (m String)
 getUrl url = do
   (code, body) <- curlGetString url [CurlSSLVerifyPeer False,
@@ -31,12 +31,13 @@ getUrl url = do
             _ -> fail $ printf "Curl error for '%s', error %s"
                  url (show code))
 
--- | Append the default port if not passed in
+-- | Append the default port if not passed in.
 formatHost :: String -> String
 formatHost master =
     if elem ':' master then  master
     else "https://" ++ master ++ ":5080"
 
+-- | Parse a instance list in JSON format.
 getInstances :: NameAssoc
              -> String
              -> Result [(String, Instance.Instance)]
@@ -45,13 +46,15 @@ getInstances ktn body = do
   ilist <- mapM (parseInstance ktn) arr
   return ilist
 
+-- | Parse a node list in JSON format.
 getNodes :: String -> Result [(String, Node.Node)]
 getNodes body = do
   arr <- loadJSArray body
   nlist <- mapM parseNode arr
   return nlist
 
-parseInstance :: [(String, Int)]
+-- | Construct an instance from a JSON object.
+parseInstance :: [(String, Ndx)]
               -> JSObject JSValue
               -> Result (String, Instance.Instance)
 parseInstance ktn a = do
@@ -63,15 +66,16 @@ parseInstance ktn a = do
   snode <- (if null snodes then return Node.noSecondary
             else readEitherString (head snodes) >>= lookupNode ktn name)
   running <- fromObj "status" a
-  let inst = Instance.create mem disk running pnode snode
+  let inst = Instance.create name mem disk running pnode snode
   return (name, inst)
 
+-- | Construct a node from a JSON object.
 parseNode :: JSObject JSValue -> Result (String, Node.Node)
 parseNode a = do
     name <- fromObj "name" a
     offline <- fromObj "offline" a
     node <- (case offline of
-               True -> return $ Node.create 0 0 0 0 0 True
+               True -> return $ Node.create name 0 0 0 0 0 True
                _ -> do
                  drained <- fromObj "drained" a
                  mtotal <- fromObj "mtotal" a
@@ -79,20 +83,20 @@ parseNode a = do
                  mfree <- fromObj "mfree" a
                  dtotal <- fromObj "dtotal" a
                  dfree <- fromObj "dfree" a
-                 return $ Node.create mtotal mnode mfree
+                 return $ Node.create name mtotal mnode mfree
                         dtotal dfree (offline || drained))
     return (name, node)
 
-loadData :: String -- ^ Cluster/URL to use as source
-         -> IO (Result (NameAssoc, Node.AssocList,
-                        NameAssoc, Instance.AssocList))
+-- | Builds the cluster data from an URL.
+loadData :: String -- ^ Cluster or URL to use as source
+         -> IO (Result (Node.AssocList, Instance.AssocList))
 loadData master = do -- IO monad
   let url = formatHost master
   node_body <- getUrl $ printf "%s/2/nodes?bulk=1" url
   inst_body <- getUrl $ printf "%s/2/instances?bulk=1" url
   return $ do -- Result monad
     node_data <- node_body >>= getNodes
-    let (node_names, node_idx) = assignIndices Node.setIdx node_data
+    let (node_names, node_idx) = assignIndices node_data
     inst_data <- inst_body >>= getInstances node_names
-    let (inst_names, inst_idx) = assignIndices Instance.setIdx inst_data
-    return (node_names, node_idx, inst_names, inst_idx)
+    let (_, inst_idx) = assignIndices inst_data
+    return (node_idx, inst_idx)