From 1094acda35687a23ef68aa592e5428dd882c76fa Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 8 Jun 2009 14:09:00 +0100
Subject: [PATCH] Show nic parameters in cluster info
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 1 +
scripts/gnt-cluster | 24 ++++++++++++++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 673bfdeb4..ea284e1f6 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2518,6 +2518,7 @@ class LUQueryClusterInfo(NoHooksLU):
"hvparams": dict([(hypervisor, cluster.hvparams[hypervisor])
for hypervisor in cluster.enabled_hypervisors]),
"beparams": cluster.beparams,
+ "nicparams": cluster.nicparams,
"candidate_pool_size": cluster.candidate_pool_size,
"default_bridge": cluster.default_bridge,
"master_netdev": cluster.master_netdev,
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index f7f0bc3eb..3986deaa4 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -209,6 +209,17 @@ def ShowClusterMaster(opts, args):
ToStdout(master)
return 0
+def _PrintGroupedParams(paramsdict):
+ """Print Grouped parameters (be, nic, disk) by group.
+
+ @type paramsdict: dict of dicts
+ @param paramsdict: {group: {param: value, ...}, ...}
+
+ """
+ for gr_name, gr_dict in paramsdict.items():
+ ToStdout(" - %s:", gr_name)
+ for item, val in gr_dict.iteritems():
+ ToStdout(" %s: %s", item, val)
def ShowClusterConfig(opts, args):
"""Shows cluster information.
@@ -234,10 +245,7 @@ def ShowClusterConfig(opts, args):
ToStdout("Enabled hypervisors: %s", ", ".join(result["enabled_hypervisors"]))
ToStdout("Hypervisor parameters:")
- for hv_name, hv_dict in result["hvparams"].items():
- ToStdout(" - %s:", hv_name)
- for item, val in hv_dict.iteritems():
- ToStdout(" %s: %s", item, val)
+ _PrintGroupedParams(result["hvparams"])
ToStdout("Cluster parameters:")
ToStdout(" - candidate pool size: %s", result["candidate_pool_size"])
@@ -247,10 +255,10 @@ def ShowClusterConfig(opts, args):
ToStdout(" - file storage path: %s", result["file_storage_dir"])
ToStdout("Default instance parameters:")
- for gr_name, gr_dict in result["beparams"].items():
- ToStdout(" - %s:", gr_name)
- for item, val in gr_dict.iteritems():
- ToStdout(" %s: %s", item, val)
+ _PrintGroupedParams(result["beparams"])
+
+ ToStdout("Default nic parameters:")
+ _PrintGroupedParams(result["nicparams"])
return 0
--
GitLab