Expand Objects.hs definitions

[ganeti-local] / htools / Ganeti / Rpc.hs

diff --git a/htools/Ganeti/Rpc.hs b/htools/Ganeti/Rpc.hs
index cf3a59e..48c6d2b 100644 (file)
--- a/htools/Ganeti/Rpc.hs
+++ b/htools/Ganeti/Rpc.hs
@@ -47,6 +47,11 @@ module Ganeti.Rpc
   , RpcCallInstanceList(..)
   , RpcResultInstanceList(..)
 
+  , HvInfo(..)
+  , VgInfo(..)
+  , RpcCallNodeInfo(..)
+  , RpcResultNodeInfo(..)
+
   , rpcTimeoutFromRaw -- FIXME: Not used anywhere
   ) where
 
@@ -97,7 +102,7 @@ instance Show RpcError where
     "Node " ++ nodeName node ++ " is marked as offline"
 
 rpcErrorJsonReport :: (Monad m) => J.Result a -> m (Either RpcError a)
-rpcErrorJsonReport (J.Error x) = return $ Left $ JsonDecodeError x
+rpcErrorJsonReport (J.Error x) = return . Left $ JsonDecodeError x
 rpcErrorJsonReport (J.Ok x) = return $ Right x
 
 -- | Basic timeouts for RPC calls.
@@ -157,9 +162,9 @@ executeHttpRequest node (Right request) = do
       url = requestUrl request
   -- FIXME: This is very similar to getUrl in Htools/Rapi.hs
   (code, !body) <- curlGetString url $ curlOpts ++ reqOpts
-  case code of
-    CurlOK -> return $ Right body
-    _ -> return $ Left $ CurlLayerError node (show code)
+  return $ case code of
+             CurlOK -> Right body
+             _ -> Left $ CurlLayerError node (show code)
 #endif
 
 -- | Prepare url for the HTTP request.
@@ -248,3 +253,41 @@ instance RpcCall RpcCallInstanceList where
 instance RpcResult RpcResultInstanceList
 
 instance Rpc RpcCallInstanceList RpcResultInstanceList
+
+-- | NodeInfo
+-- Return node information.
+$(buildObject "RpcCallNodeInfo" "rpcCallNodeInfo" $
+  [ simpleField "hypervisors" [t| [Hypervisor] |]
+  , simpleField "volume_groups" [t| [String] |]
+  ])
+
+$(buildObject "VgInfo" "vgInfo" $
+  [ simpleField "name" [t| String |]
+  , simpleField "free" [t| Int |]
+  , simpleField "size" [t| Int |]
+  ])
+
+-- | We only provide common fields as described in hv_base.py.
+$(buildObject "HvInfo" "hvInfo" $
+  [ simpleField "memory_total" [t| Int |]
+  , simpleField "memory_free" [t| Int |]
+  , simpleField "memory_dom0" [t| Int |]
+  , simpleField "cpu_total" [t| Int |]
+  , simpleField "cpu_nodes" [t| Int |]
+  , simpleField "cpu_sockets" [t| Int |]
+  ])
+
+$(buildObject "RpcResultNodeInfo" "rpcResNodeInfo" $
+  [ simpleField "boot_id" [t| String |]
+  , simpleField "vg_info" [t| [VgInfo] |]
+  , simpleField "hv_info" [t| [HvInfo] |]
+  ])
+
+instance RpcCall RpcCallNodeInfo where
+  rpcCallName _ = "node_info"
+  rpcCallTimeout _ = rpcTimeoutToRaw Urgent
+  rpcCallAcceptOffline _ = False
+
+instance RpcResult RpcResultNodeInfo
+
+instance Rpc RpcCallNodeInfo RpcResultNodeInfo