From 5188fdb7595ebf231dfc41ee7428c674a03f6fc5 Mon Sep 17 00:00:00 2001
From: Agata Murawska <agatamurawska@google.com>
Date: Tue, 18 Sep 2012 10:20:56 +0200
Subject: [PATCH] InstanceInfo RPC call
This patch implements single instance info call - somewhat similar to
all_instances_info, except we give a specific instance name.
Current implementation of reading the InstanceInfo value is somewhat
counter-intuitive because when we query a node on thich there is
no instance with such name, this is not considered an error - but
it does produce an empty answer. Therefore the resulting type is
optional.
Signed-off-by: Agata Murawska <agatamurawska@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
htools/Ganeti/Rpc.hs | 46 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/htools/Ganeti/Rpc.hs b/htools/Ganeti/Rpc.hs
index f9cac8c25..e1f539682 100644
--- a/htools/Ganeti/Rpc.hs
+++ b/htools/Ganeti/Rpc.hs
@@ -41,6 +41,9 @@ module Ganeti.Rpc
, rpcResultFill
, InstanceInfo(..)
+ , RpcCallInstanceInfo(..)
+ , RpcResultInstanceInfo(..)
+
, RpcCallAllInstancesInfo(..)
, RpcResultAllInstancesInfo(..)
@@ -233,10 +236,13 @@ sanitizeDictResults ((name, J.Ok val):xs) =
-- * RPC calls and results
--- | AllInstancesInfo
--- Returns information about all running instances on the given nodes.
-$(buildObject "RpcCallAllInstancesInfo" "rpcCallAllInstInfo"
- [ simpleField "hypervisors" [t| [Hypervisor] |] ])
+-- | InstanceInfo
+-- Returns information about a single instance.
+
+$(buildObject "RpcCallInstanceInfo" "rpcCallInstInfo"
+ [ simpleField "instance" [t| String |]
+ , simpleField "hname" [t| Hypervisor |]
+ ])
$(buildObject "InstanceInfo" "instInfo"
[ simpleField "memory" [t| Int|]
@@ -245,6 +251,38 @@ $(buildObject "InstanceInfo" "instInfo"
, simpleField "time" [t| Int |]
])
+-- This is optional here because the result may be empty if instance is
+-- not on a node - and this is not considered an error.
+$(buildObject "RpcResultInstanceInfo" "rpcResInstInfo"
+ [ optionalField $ simpleField "inst_info" [t| InstanceInfo |]])
+
+instance RpcCall RpcCallInstanceInfo where
+ rpcCallName _ = "instance_info"
+ rpcCallTimeout _ = rpcTimeoutToRaw Urgent
+ rpcCallAcceptOffline _ = False
+ rpcCallData _ call = J.encode
+ ( rpcCallInstInfoInstance call
+ , rpcCallInstInfoHname call
+ )
+
+instance Rpc RpcCallInstanceInfo RpcResultInstanceInfo where
+ rpcResultFill _ res =
+ return $ case res of
+ J.JSObject res' ->
+ case J.fromJSObject res' of
+ [] -> Right $ RpcResultInstanceInfo Nothing
+ _ ->
+ case J.readJSON res of
+ J.Error err -> Left $ JsonDecodeError err
+ J.Ok val -> Right . RpcResultInstanceInfo $ Just val
+ _ -> Left $ JsonDecodeError
+ ("Expected JSObject, got " ++ show res)
+
+-- | AllInstancesInfo
+-- Returns information about all running instances on the given nodes
+$(buildObject "RpcCallAllInstancesInfo" "rpcCallAllInstInfo"
+ [ simpleField "hypervisors" [t| [Hypervisor] |] ])
+
$(buildObject "RpcResultAllInstancesInfo" "rpcResAllInstInfo"
[ simpleField "instances" [t| [(String, InstanceInfo)] |] ])
--
GitLab