Cleanup AllocSolution after AllocElement changes

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

diff --git a/Ganeti/HTools/Rapi.hs b/Ganeti/HTools/Rapi.hs
index f8545d1..58df9bd 100644 (file)
--- a/Ganeti/HTools/Rapi.hs
+++ b/Ganeti/HTools/Rapi.hs
@@ -4,7 +4,7 @@
 
 {-
 
-Copyright (C) 2009 Google Inc.
+Copyright (C) 2009, 2010 Google Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 module Ganeti.HTools.Rapi
     (
       loadData
+    , parseData
     ) where
 
 import Network.Curl
@@ -74,7 +75,7 @@ getNodes body = loadJSArray "Parsing node data" body >>=
                 mapM (parseNode . fromJSObject)
 
 -- | Construct an instance from a JSON object.
-parseInstance :: [(String, Ndx)]
+parseInstance :: NameAssoc
               -> [(String, JSValue)]
               -> Result (String, Instance.Instance)
 parseInstance ktn a = do
@@ -104,8 +105,9 @@ parseNode a = do
   let extract s = tryFromObj ("Node '" ++ name ++ "'") a s
   offline <- extract "offline"
   drained <- extract "drained"
+  guuid   <- extract "group.uuid"
   node <- (if offline || drained
-           then return $ Node.create name 0 0 0 0 0 0 True
+           then return $ Node.create name 0 0 0 0 0 0 True guuid
            else do
              mtotal  <- extract "mtotal"
              mnode   <- extract "mnode"
@@ -114,21 +116,31 @@ parseNode a = do
              dfree   <- extract "dfree"
              ctotal  <- extract "ctotal"
              return $ Node.create name mtotal mnode mfree
-                    dtotal dfree ctotal False)
+                    dtotal dfree ctotal False guuid)
   return (name, node)
 
--- | Builds the cluster data from an URL.
-loadData :: String -- ^ Cluster or URL to use as source
-         -> IO (Result (Node.AssocList, Instance.AssocList, [String]))
-loadData master = do -- IO monad
+-- | Loads the raw cluster data from an URL.
+readData :: String -- ^ Cluster or URL to use as source
+         -> IO (Result String, Result String, Result String)
+readData master = do
   let url = formatHost master
   node_body <- getUrl $ printf "%s/2/nodes?bulk=1" url
   inst_body <- getUrl $ printf "%s/2/instances?bulk=1" url
   tags_body <- getUrl $ printf "%s/2/tags" url
-  return $ do -- Result monad
-    node_data <- node_body >>= getNodes
-    let (node_names, node_idx) = assignIndices node_data
-    inst_data <- inst_body >>= getInstances node_names
-    let (_, inst_idx) = assignIndices inst_data
-    tags_data <- tags_body >>= (fromJResult "Parsing tags data" . decodeStrict)
-    return (node_idx, inst_idx, tags_data)
+  return (node_body, inst_body, tags_body)
+
+-- | Builds the cluster data from the raw Rapi content
+parseData :: (Result String, Result String, Result String)
+          -> Result (Node.List, Instance.List, [String])
+parseData (node_body, inst_body, tags_body) = do
+  node_data <- node_body >>= getNodes
+  let (node_names, node_idx) = assignIndices node_data
+  inst_data <- inst_body >>= getInstances node_names
+  let (_, inst_idx) = assignIndices inst_data
+  tags_data <- tags_body >>= (fromJResult "Parsing tags data" . decodeStrict)
+  return (node_idx, inst_idx, tags_data)
+
+-- | Top level function for data loading
+loadData :: String -- ^ Cluster or URL to use as source
+            -> IO (Result (Node.List, Instance.List, [String]))
+loadData master = readData master >>= return . parseData