Revision bc5d0215 lib/client/gnt_group.py

b/lib/client/gnt_group.py
48 48

  
49 49
  """
50 50
  (group_name,) = args
51
  diskparams = dict(opts.diskparams)
51 52
  op = opcodes.OpGroupAdd(group_name=group_name, ndparams=opts.ndparams,
52
                          alloc_policy=opts.alloc_policy)
53
                          alloc_policy=opts.alloc_policy,
54
                          diskparams=diskparams)
53 55
  SubmitOpCode(op, opts=opts)
54 56

  
55 57

  
......
133 135
  @return: the desired exit code
134 136

  
135 137
  """
136
  if opts.ndparams is None and opts.alloc_policy is None:
138
  if (opts.ndparams is None and opts.alloc_policy is None
139
      and not opts.diskparams):
137 140
    ToStderr("Please give at least one of the parameters.")
138 141
    return 1
139 142

  
143
  diskparams = dict(opts.diskparams)
140 144
  op = opcodes.OpGroupSetParams(group_name=args[0],
141 145
                                ndparams=opts.ndparams,
142
                                alloc_policy=opts.alloc_policy)
146
                                alloc_policy=opts.alloc_policy,
147
                                diskparams=diskparams)
143 148
  result = SubmitOrSend(op, opts)
144 149

  
145 150
  if result:
......
214 219

  
215 220
commands = {
216 221
  "add": (
217
    AddGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT],
222
    AddGroup, ARGS_ONE_GROUP,
223
    [DRY_RUN_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT, DISK_PARAMS_OPT],
218 224
    "<group_name>", "Add a new node group to the cluster"),
219 225
  "assign-nodes": (
220 226
    AssignNodes, ARGS_ONE_GROUP + ARGS_MANY_NODES, [DRY_RUN_OPT, FORCE_OPT],
......
231 237
    "Lists all available fields for node groups"),
232 238
  "modify": (
233 239
    SetGroupParams, ARGS_ONE_GROUP,
234
    [DRY_RUN_OPT, SUBMIT_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT],
240
    [DRY_RUN_OPT, SUBMIT_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT,
241
     DISK_PARAMS_OPT],
235 242
    "<group_name>", "Alters the parameters of a node group"),
236 243
  "remove": (
237 244
    RemoveGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT],

Also available in: Unified diff