gnt-cluster info: show more cluster parameters

[ganeti-local] / scripts / gnt-cluster

diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 09c1eb2..9a17b96 100755 (executable)
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -69,13 +69,7 @@ def InitCluster(opts, args):
              (opts.default_hypervisor, hvlist))
     return 1
 
-  hvparams = opts.hvparams
-  if hvparams:
-    # a list of (name, dict) we can pass directly to dict()
-    hvparams = dict(opts.hvparams)
-  else:
-    # otherwise init as empty dict
-    hvparams = {}
+  hvparams = dict(opts.hvparams)
 
   beparams = opts.beparams
   # check for invalid parameters
@@ -88,17 +82,7 @@ def InitCluster(opts, args):
   for parameter in constants.BES_PARAMETERS:
     if parameter not in beparams:
       beparams[parameter] = constants.BEC_DEFAULTS[parameter]
-
-  # type wrangling
-  try:
-    beparams[constants.BE_VCPUS] = int(beparams[constants.BE_VCPUS])
-  except ValueError:
-    ToStderr("%s must be an integer", constants.BE_VCPUS)
-    return 1
-
-  if not isinstance(beparams[constants.BE_MEMORY], int):
-    beparams[constants.BE_MEMORY] = utils.ParseUnit(
-        beparams[constants.BE_MEMORY])
+  utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
 
   # prepare hvparams dict
   for hv in constants.HYPER_TYPES:
@@ -107,6 +91,7 @@ def InitCluster(opts, args):
     for parameter in constants.HVC_DEFAULTS[hv]:
       if parameter not in hvparams[hv]:
         hvparams[hv][parameter] = constants.HVC_DEFAULTS[hv][parameter]
+    utils.ForceDictType(hvparams[hv], constants.HVS_PARAMETER_TYPES)
 
   for hv in hvlist:
     if hv not in constants.HYPER_TYPES:
@@ -187,7 +172,7 @@ def RedistributeConfig(opts, args):
   @return: the desired exit code
 
   """
-  op = opcodes.OpRedistributeConf()
+  op = opcodes.OpRedistributeConfig()
   SubmitOrSend(op, opts)
   return 0
 
@@ -202,8 +187,8 @@ def ShowClusterVersion(opts, args):
   @return: the desired exit code
 
   """
-  op = opcodes.OpQueryClusterInfo()
-  result = SubmitOpCode(op)
+  cl = GetClient()
+  result = cl.QueryClusterInfo()
   ToStdout("Software version: %s", result["software_version"])
   ToStdout("Internode protocol: %s", result["protocol_version"])
   ToStdout("Configuration format: %s", result["config_version"])
@@ -222,7 +207,8 @@ def ShowClusterMaster(opts, args):
   @return: the desired exit code
 
   """
-  ToStdout("%s", GetClient().QueryConfigValues(["master_node"])[0])
+  master = bootstrap.GetMaster()
+  ToStdout(master)
   return 0
 
 
@@ -236,8 +222,8 @@ def ShowClusterConfig(opts, args):
   @return: the desired exit code
 
   """
-  op = opcodes.OpQueryClusterInfo()
-  result = SubmitOpCode(op)
+  cl = GetClient()
+  result = cl.QueryClusterInfo()
 
   ToStdout("Cluster name: %s", result["name"])
 
@@ -257,6 +243,10 @@ def ShowClusterConfig(opts, args):
 
   ToStdout("Cluster parameters:")
   ToStdout("  - candidate pool size: %s", result["candidate_pool_size"])
+  ToStdout("  - master netdev: %s", result["master_netdev"])
+  ToStdout("  - default bridge: %s", result["default_bridge"])
+  ToStdout("  - lvm volume group: %s", result["volume_group_name"])
+  ToStdout("  - file storage path: %s", result["file_storage_dir"])
 
   ToStdout("Default instance parameters:")
   for gr_name, gr_dict in result["beparams"].items():
@@ -381,7 +371,7 @@ def VerifyDisks(opts, args):
   if nlvm:
     for node, text in nlvm.iteritems():
       ToStdout("Error on node %s: LVM error: %s",
-               node, text[-400:].encode('string_escape'))
+               node, utils.SafeEncode(text[-400:]))
       retcode |= 1
       ToStdout("You need to fix these nodes first before fixing instances")
 
@@ -482,12 +472,13 @@ def SetClusterParams(opts, args):
   if hvlist is not None:
     hvlist = hvlist.split(",")
 
-  hvparams = opts.hvparams
-  if hvparams:
-    # a list of (name, dict) we can pass directly to dict()
-    hvparams = dict(opts.hvparams)
+  # a list of (name, dict) we can pass directly to dict() (or [])
+  hvparams = dict(opts.hvparams)
+  for hv, hv_params in hvparams.iteritems():
+    utils.ForceDictType(hv_params, constants.HVS_PARAMETER_TYPES)
 
   beparams = opts.beparams
+  utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
 
   op = opcodes.OpSetClusterParams(vg_name=opts.vg_name,
                                   enabled_hypervisors=hvlist,
@@ -520,6 +511,9 @@ def QueueOps(opts, args):
     else:
       val = "unset"
     ToStdout("The drain flag is %s" % val)
+  else:
+    raise errors.OpPrereqError("Command '%s' is not valid." % command)
+
   return 0
 
 # this is an option common to more than one command, so we declare
@@ -541,7 +535,7 @@ commands = {
                         help="Specify the mac prefix for the instance IP"
                         " addresses, in the format XX:XX:XX",
                         metavar="PREFIX",
-                        default="aa:00:00",),
+                        default=constants.DEFAULT_MAC_PREFIX,),
             make_option("-g", "--vg-name", dest="vg_name",
                         help="Specify the volume group name "
                         " (cluster-wide) for disk allocation [xenvg]",