Revision d6cd74dd lib/client/gnt_network.py

b/lib/client/gnt_network.py
313 313
    AddNetwork, ARGS_ONE_NETWORK,
314 314
    [DRY_RUN_OPT, NETWORK_OPT, GATEWAY_OPT, ADD_RESERVED_IPS_OPT,
315 315
     MAC_PREFIX_OPT, NETWORK6_OPT, GATEWAY6_OPT,
316
     NOCONFLICTSCHECK_OPT, TAG_ADD_OPT, PRIORITY_OPT, SUBMIT_OPT],
316
     NOCONFLICTSCHECK_OPT, TAG_ADD_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
317 317
    "<network_name>", "Add a new IP network to the cluster"),
318 318
  "list": (
319 319
    ListNetworks, ARGS_MANY_NETWORKS,
......
330 330
    "[<network_name>...]", "Show information about the network(s)"),
331 331
  "modify": (
332 332
    SetNetworkParams, ARGS_ONE_NETWORK,
333
    [DRY_RUN_OPT, SUBMIT_OPT, ADD_RESERVED_IPS_OPT, REMOVE_RESERVED_IPS_OPT,
334
     GATEWAY_OPT, MAC_PREFIX_OPT, NETWORK6_OPT, GATEWAY6_OPT,
335
     PRIORITY_OPT],
333
    [DRY_RUN_OPT] + SUBMIT_OPTS +
334
    [ADD_RESERVED_IPS_OPT,
335
     REMOVE_RESERVED_IPS_OPT, GATEWAY_OPT, MAC_PREFIX_OPT, NETWORK6_OPT,
336
     GATEWAY6_OPT, PRIORITY_OPT],
336 337
    "<network_name>", "Alters the parameters of a network"),
337 338
  "connect": (
338 339
    ConnectNetwork,
......
352 353
    "Unmap a given network from a specified node group"),
353 354
  "remove": (
354 355
    RemoveNetwork, ARGS_ONE_NETWORK,
355
    [FORCE_OPT, DRY_RUN_OPT, SUBMIT_OPT, PRIORITY_OPT],
356
    [FORCE_OPT, DRY_RUN_OPT] + SUBMIT_OPTS + [PRIORITY_OPT],
356 357
    "[--dry-run] <network_id>",
357 358
    "Remove an (empty) network from the cluster"),
358 359
  "list-tags": (
......
360 361
    "<network_name>", "List the tags of the given network"),
361 362
  "add-tags": (
362 363
    AddTags, [ArgNetwork(min=1, max=1), ArgUnknown()],
363
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
364
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
364 365
    "<network_name> tag...", "Add tags to the given network"),
365 366
  "remove-tags": (
366 367
    RemoveTags, [ArgNetwork(min=1, max=1), ArgUnknown()],
367
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
368
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
368 369
    "<network_name> tag...", "Remove tags from given network"),
369 370
}
370 371

  

Also available in: Unified diff