Revision dcbeccd9 lib/client/gnt_group.py

b/lib/client/gnt_group.py
70 70
                          diskparams=diskparams, ipolicy=ipolicy,
71 71
                          hv_state=hv_state,
72 72
                          disk_state=disk_state)
73
  SubmitOpCode(op, opts=opts)
73
  SubmitOrSend(op, opts)
74 74

  
75 75

  
76 76
def AssignNodes(opts, args):
......
88 88

  
89 89
  op = opcodes.OpGroupAssignNodes(group_name=group_name, nodes=node_names,
90 90
                                  force=opts.force)
91
  SubmitOpCode(op, opts=opts)
91
  SubmitOrSend(op, opts)
92 92

  
93 93

  
94 94
def _FmtDict(data):
......
224 224
  """
225 225
  (group_name,) = args
226 226
  op = opcodes.OpGroupRemove(group_name=group_name)
227
  SubmitOpCode(op, opts=opts)
227
  SubmitOrSend(op, opts)
228 228

  
229 229

  
230 230
def RenameGroup(opts, args):
......
239 239
  """
240 240
  group_name, new_name = args
241 241
  op = opcodes.OpGroupRename(group_name=group_name, new_name=new_name)
242
  SubmitOpCode(op, opts=opts)
242
  SubmitOrSend(op, opts)
243 243

  
244 244

  
245 245
def EvacuateGroup(opts, args):
......
254 254
                               iallocator=opts.iallocator,
255 255
                               target_groups=opts.to,
256 256
                               early_release=opts.early_release)
257
  result = SubmitOpCode(op, cl=cl, opts=opts)
257
  result = SubmitOrSend(op, opts, cl=cl)
258 258

  
259 259
  # Keep track of submitted jobs
260 260
  jex = JobExecutor(cl=cl, opts=opts)
......
277 277
  "add": (
278 278
    AddGroup, ARGS_ONE_GROUP,
279 279
    [DRY_RUN_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT, DISK_PARAMS_OPT,
280
     HV_STATE_OPT, DISK_STATE_OPT] + INSTANCE_POLICY_OPTS,
280
     HV_STATE_OPT, DISK_STATE_OPT, PRIORITY_OPT,
281
     SUBMIT_OPT] + INSTANCE_POLICY_OPTS,
281 282
    "<group_name>", "Add a new node group to the cluster"),
282 283
  "assign-nodes": (
283
    AssignNodes, ARGS_ONE_GROUP + ARGS_MANY_NODES, [DRY_RUN_OPT, FORCE_OPT],
284
    AssignNodes, ARGS_ONE_GROUP + ARGS_MANY_NODES,
285
    [DRY_RUN_OPT, FORCE_OPT, PRIORITY_OPT, SUBMIT_OPT],
284 286
    "<group_name> <node>...", "Assign nodes to a group"),
285 287
  "list": (
286 288
    ListGroups, ARGS_MANY_GROUPS,
......
295 297
  "modify": (
296 298
    SetGroupParams, ARGS_ONE_GROUP,
297 299
    [DRY_RUN_OPT, SUBMIT_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT, HV_STATE_OPT,
298
     DISK_STATE_OPT, DISK_PARAMS_OPT] + INSTANCE_POLICY_OPTS,
300
     DISK_STATE_OPT, DISK_PARAMS_OPT, PRIORITY_OPT] + INSTANCE_POLICY_OPTS,
299 301
    "<group_name>", "Alters the parameters of a node group"),
300 302
  "remove": (
301
    RemoveGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT],
303
    RemoveGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT, PRIORITY_OPT, SUBMIT_OPT],
302 304
    "[--dry-run] <group-name>",
303 305
    "Remove an (empty) node group from the cluster"),
304 306
  "rename": (
305
    RenameGroup, [ArgGroup(min=2, max=2)], [DRY_RUN_OPT],
307
    RenameGroup, [ArgGroup(min=2, max=2)],
308
    [DRY_RUN_OPT, SUBMIT_OPT, PRIORITY_OPT],
306 309
    "[--dry-run] <group-name> <new-name>", "Rename a node group"),
307 310
  "evacuate": (
308 311
    EvacuateGroup, [ArgGroup(min=1, max=1)],
309
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT],
312
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT, SUBMIT_OPT, PRIORITY_OPT],
310 313
    "[-I <iallocator>] [--to <group>]",
311 314
    "Evacuate all instances within a group"),
312 315
  "list-tags": (

Also available in: Unified diff