X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/d3cfe525fd83f6155452a27ae67dc7849a1b5b28..cd098c41522469e462efeb1e157a8718ff7b7809:/scripts/gnt-cluster

diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 7f4f511..3986dea 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -72,11 +72,16 @@ def InitCluster(opts, args):
 
   hvparams = dict(opts.hvparams)
   beparams = opts.beparams
+  nicparams = opts.nicparams
 
   # prepare beparams dict
   beparams = objects.FillDict(constants.BEC_DEFAULTS, beparams)
   utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
 
+  # prepare nicparams dict
+  nicparams = objects.FillDict(constants.NICC_DEFAULTS, nicparams)
+  utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
+
   # prepare hvparams dict
   for hv in constants.HYPER_TYPES:
     if hv not in hvparams:
@@ -100,6 +105,7 @@ def InitCluster(opts, args):
                         default_hypervisor=opts.default_hypervisor,
                         hvparams=hvparams,
                         beparams=beparams,
+                        nicparams=nicparams,
                         candidate_pool_size=opts.candidate_pool_size,
                         modify_etc_hosts=opts.modify_etc_hosts,
                         )
@@ -203,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.
@@ -228,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"])
@@ -241,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
 
@@ -451,7 +465,8 @@ def SetClusterParams(opts, args):
   """
   if not (not opts.lvm_storage or opts.vg_name or
           opts.enabled_hypervisors or opts.hvparams or
-          opts.beparams or opts.candidate_pool_size is not None):
+          opts.beparams or opts.nicparams or
+          opts.candidate_pool_size is not None):
     ToStderr("Please give at least one of the parameters.")
     return 1
 
@@ -474,10 +489,14 @@ def SetClusterParams(opts, args):
   beparams = opts.beparams
   utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES)
 
+  nicparams = opts.nicparams
+  utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES)
+
   op = opcodes.OpSetClusterParams(vg_name=vg_name,
                                   enabled_hypervisors=hvlist,
                                   hvparams=hvparams,
                                   beparams=beparams,
+                                  nicparams=nicparams,
                                   candidate_pool_size=opts.candidate_pool_size)
   SubmitOpCode(op)
   return 0
@@ -579,6 +598,9 @@ commands = {
             keyval_option("-B", "--backend-parameters", dest="beparams",
                           type="keyval", default={},
                           help="Backend parameters"),
+            keyval_option("-N", "--nic-parameters", dest="nicparams",
+                          type="keyval", default={},
+                          help="NIC parameters"),
             make_option("-C", "--candidate-pool-size",
                         default=constants.MASTER_POOL_SIZE_DEFAULT,
                         help="Set the candidate pool size",
@@ -658,6 +680,9 @@ commands = {
               keyval_option("-B", "--backend-parameters", dest="beparams",
                             type="keyval", default={},
                             help="Backend parameters"),
+              keyval_option("-N", "--nic-parameters", dest="nicparams",
+                            type="keyval", default={},
+                            help="NIC parameters"),
               make_option("-C", "--candidate-pool-size", default=None,
                           help="Set the candidate pool size",
                           dest="candidate_pool_size", type="int"),