From a2160e5703ae1bb3452b8260d82a0798d52cc883 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Wed, 22 Aug 2012 18:53:34 +0200
Subject: [PATCH] Complete and enable the haskell QueryClusterInfo call
Since we have now access to all cluster parameters, we can "fill" the
parameters, and can finally enable it in CLI/RAPI.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Agata Murawska <agatamurawska@google.com>
---
htools/Ganeti/Queryd.hs | 9 +++------
lib/client/gnt_cluster.py | 2 +-
lib/rapi/rlib2.py | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/htools/Ganeti/Queryd.hs b/htools/Ganeti/Queryd.hs
index 1ac44fc16..eeeef7ac6 100644
--- a/htools/Ganeti/Queryd.hs
+++ b/htools/Ganeti/Queryd.hs
@@ -66,8 +66,6 @@ handleCall cdata QueryClusterInfo =
hypervisors = clusterEnabledHypervisors cluster
bits = show (bitSize (0::Int)) ++ "bits"
arch_tuple = [bits, arch]
- -- FIXME: this is for the missing *params fields
- empty_params = showJSON $ J.makeObj ([]::[(String, JSValue)])
obj = [ ("software_version", showJSON $ C.releaseVersion)
, ("protocol_version", showJSON $ C.protocolVersion)
, ("config_version", showJSON $ C.configVersion)
@@ -78,15 +76,14 @@ handleCall cdata QueryClusterInfo =
, ("master", showJSON $ clusterMasterNode cluster)
, ("default_hypervisor", showJSON $ head hypervisors)
, ("enabled_hypervisors", showJSON $ hypervisors)
- -- FIXME: *params missing
- , ("hvparams", empty_params)
- , ("os_hvp", empty_params)
+ , ("hvparams", showJSON $ clusterHvparams cluster)
+ , ("os_hvp", showJSON $ clusterOsHvp cluster)
, ("beparams", showJSON $ clusterBeparams cluster)
, ("osparams", showJSON $ clusterOsparams cluster)
, ("ipolicy", showJSON $ clusterIpolicy cluster)
, ("nicparams", showJSON $ clusterNicparams cluster)
, ("ndparams", showJSON $ clusterNdparams cluster)
- , ("diskparams", empty_params)
+ , ("diskparams", showJSON $ clusterDiskparams cluster)
, ("candidate_pool_size",
showJSON $ clusterCandidatePoolSize cluster)
, ("master_netdev", showJSON $ clusterMasterNetdev cluster)
diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index 680ced658..309f37ecb 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -389,7 +389,7 @@ def ShowClusterConfig(opts, args):
@return: the desired exit code
"""
- cl = GetClient()
+ cl = GetClient(query=True)
result = cl.QueryClusterInfo()
ToStdout("Cluster name: %s", result["name"])
diff --git a/lib/rapi/rlib2.py b/lib/rapi/rlib2.py
index 4259a6e34..e77dca8a8 100644
--- a/lib/rapi/rlib2.py
+++ b/lib/rapi/rlib2.py
@@ -214,7 +214,7 @@ class R_2_info(baserlib.OpcodeResource):
"""Returns cluster information.
"""
- client = self.GetClient()
+ client = self.GetClient(query=True)
return client.QueryClusterInfo()
--
GitLab