Revision d6cd74dd lib/client/gnt_instance.py

b/lib/client/gnt_instance.py
1458 1458
    "Creates and adds a new instance to the cluster"),
1459 1459
  "batch-create": (
1460 1460
    BatchCreate, [ArgFile(min=1, max=1)],
1461
    [DRY_RUN_OPT, PRIORITY_OPT, IALLOCATOR_OPT, SUBMIT_OPT],
1461
    [DRY_RUN_OPT, PRIORITY_OPT, IALLOCATOR_OPT] + SUBMIT_OPTS,
1462 1462
    "<instances.json>",
1463 1463
    "Create a bunch of instances based on specs in the file."),
1464 1464
  "console": (
......
1467 1467
    "[--show-cmd] <instance>", "Opens a console on the specified instance"),
1468 1468
  "failover": (
1469 1469
    FailoverInstance, ARGS_ONE_INSTANCE,
1470
    [FORCE_OPT, IGNORE_CONSIST_OPT, SUBMIT_OPT, SHUTDOWN_TIMEOUT_OPT,
1470
    [FORCE_OPT, IGNORE_CONSIST_OPT] + SUBMIT_OPTS +
1471
    [SHUTDOWN_TIMEOUT_OPT,
1471 1472
     DRY_RUN_OPT, PRIORITY_OPT, DST_NODE_OPT, IALLOCATOR_OPT,
1472 1473
     IGNORE_IPOLICY_OPT],
1473 1474
    "[-f] <instance>", "Stops the instance, changes its primary node and"
......
1478 1479
    MigrateInstance, ARGS_ONE_INSTANCE,
1479 1480
    [FORCE_OPT, NONLIVE_OPT, MIGRATION_MODE_OPT, CLEANUP_OPT, DRY_RUN_OPT,
1480 1481
     PRIORITY_OPT, DST_NODE_OPT, IALLOCATOR_OPT, ALLOW_FAILOVER_OPT,
1481
     IGNORE_IPOLICY_OPT, NORUNTIME_CHGS_OPT, SUBMIT_OPT],
1482
     IGNORE_IPOLICY_OPT, NORUNTIME_CHGS_OPT] + SUBMIT_OPTS,
1482 1483
    "[-f] <instance>", "Migrate instance to its secondary node"
1483 1484
    " (only for mirrored instances)"),
1484 1485
  "move": (
1485 1486
    MoveInstance, ARGS_ONE_INSTANCE,
1486
    [FORCE_OPT, SUBMIT_OPT, SINGLE_NODE_OPT, SHUTDOWN_TIMEOUT_OPT,
1487
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_CONSIST_OPT, IGNORE_IPOLICY_OPT],
1487
    [FORCE_OPT] + SUBMIT_OPTS +
1488
    [SINGLE_NODE_OPT,
1489
     SHUTDOWN_TIMEOUT_OPT, DRY_RUN_OPT, PRIORITY_OPT, IGNORE_CONSIST_OPT,
1490
     IGNORE_IPOLICY_OPT],
1488 1491
    "[-f] <instance>", "Move instance to an arbitrary node"
1489 1492
    " (only for instances of type file and lv)"),
1490 1493
  "info": (
......
1511 1514
    ReinstallInstance, [ArgInstance()],
1512 1515
    [FORCE_OPT, OS_OPT, FORCE_VARIANT_OPT, m_force_multi, m_node_opt,
1513 1516
     m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, m_node_tags_opt,
1514
     m_pri_node_tags_opt, m_sec_node_tags_opt, m_inst_tags_opt, SELECT_OS_OPT,
1515
     SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT],
1517
     m_pri_node_tags_opt, m_sec_node_tags_opt, m_inst_tags_opt, SELECT_OS_OPT]
1518
    + SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT, OSPARAMS_OPT],
1516 1519
    "[-f] <instance>", "Reinstall a stopped instance"),
1517 1520
  "remove": (
1518 1521
    RemoveInstance, ARGS_ONE_INSTANCE,
1519
    [FORCE_OPT, SHUTDOWN_TIMEOUT_OPT, IGNORE_FAILURES_OPT, SUBMIT_OPT,
1520
     DRY_RUN_OPT, PRIORITY_OPT],
1522
    [FORCE_OPT, SHUTDOWN_TIMEOUT_OPT, IGNORE_FAILURES_OPT] + SUBMIT_OPTS
1523
    + [DRY_RUN_OPT, PRIORITY_OPT],
1521 1524
    "[-f] <instance>", "Shuts down the instance and removes it"),
1522 1525
  "rename": (
1523 1526
    RenameInstance,
1524 1527
    [ArgInstance(min=1, max=1), ArgHost(min=1, max=1)],
1525
    [NOIPCHECK_OPT, NONAMECHECK_OPT, SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
1528
    [NOIPCHECK_OPT, NONAMECHECK_OPT] + SUBMIT_OPTS
1529
    + [DRY_RUN_OPT, PRIORITY_OPT],
1526 1530
    "<instance> <new_name>", "Rename the instance"),
1527 1531
  "replace-disks": (
1528 1532
    ReplaceDisks, ARGS_ONE_INSTANCE,
1529 1533
    [AUTO_REPLACE_OPT, DISKIDX_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT,
1530
     NEW_SECONDARY_OPT, ON_PRIMARY_OPT, ON_SECONDARY_OPT, SUBMIT_OPT,
1531
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_IPOLICY_OPT],
1534
     NEW_SECONDARY_OPT, ON_PRIMARY_OPT, ON_SECONDARY_OPT] + SUBMIT_OPTS
1535
    + [DRY_RUN_OPT, PRIORITY_OPT, IGNORE_IPOLICY_OPT],
1532 1536
    "[-s|-p|-a|-n NODE|-I NAME] <instance>",
1533 1537
    "Replaces disks for the instance"),
1534 1538
  "modify": (
1535 1539
    SetInstanceParams, ARGS_ONE_INSTANCE,
1536
    [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT, SUBMIT_OPT,
1537
     DISK_TEMPLATE_OPT, SINGLE_NODE_OPT, OS_OPT, FORCE_VARIANT_OPT,
1540
    [BACKEND_OPT, DISK_OPT, FORCE_OPT, HVOPTS_OPT, NET_OPT] + SUBMIT_OPTS +
1541
    [DISK_TEMPLATE_OPT, SINGLE_NODE_OPT, OS_OPT, FORCE_VARIANT_OPT,
1538 1542
     OSPARAMS_OPT, DRY_RUN_OPT, PRIORITY_OPT, NWSYNC_OPT, OFFLINE_INST_OPT,
1539 1543
     ONLINE_INST_OPT, IGNORE_IPOLICY_OPT, RUNTIME_MEM_OPT,
1540 1544
     NOCONFLICTSCHECK_OPT, NEW_PRIMARY_OPT],
......
1543 1547
    GenericManyOps("shutdown", _ShutdownInstance), [ArgInstance()],
1544 1548
    [FORCE_OPT, m_node_opt, m_pri_node_opt, m_sec_node_opt, m_clust_opt,
1545 1549
     m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1546
     m_inst_tags_opt, m_inst_opt, m_force_multi, TIMEOUT_OPT, SUBMIT_OPT,
1547
     DRY_RUN_OPT, PRIORITY_OPT, IGNORE_OFFLINE_OPT, NO_REMEMBER_OPT],
1550
     m_inst_tags_opt, m_inst_opt, m_force_multi, TIMEOUT_OPT] + SUBMIT_OPTS
1551
    + [DRY_RUN_OPT, PRIORITY_OPT, IGNORE_OFFLINE_OPT, NO_REMEMBER_OPT],
1548 1552
    "<instance>", "Stops an instance"),
1549 1553
  "startup": (
1550 1554
    GenericManyOps("startup", _StartupInstance), [ArgInstance()],
1551 1555
    [FORCE_OPT, m_force_multi, m_node_opt, m_pri_node_opt, m_sec_node_opt,
1552 1556
     m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1553
     m_inst_tags_opt, m_clust_opt, m_inst_opt, SUBMIT_OPT, HVOPTS_OPT,
1557
     m_inst_tags_opt, m_clust_opt, m_inst_opt] + SUBMIT_OPTS +
1558
    [HVOPTS_OPT,
1554 1559
     BACKEND_OPT, DRY_RUN_OPT, PRIORITY_OPT, IGNORE_OFFLINE_OPT,
1555 1560
     NO_REMEMBER_OPT, STARTUP_PAUSED_OPT],
1556 1561
    "<instance>", "Starts an instance"),
1557 1562
  "reboot": (
1558 1563
    GenericManyOps("reboot", _RebootInstance), [ArgInstance()],
1559 1564
    [m_force_multi, REBOOT_TYPE_OPT, IGNORE_SECONDARIES_OPT, m_node_opt,
1560
     m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, SUBMIT_OPT,
1561
     m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1565
     m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt] + SUBMIT_OPTS +
1566
    [m_node_tags_opt, m_pri_node_tags_opt, m_sec_node_tags_opt,
1562 1567
     m_inst_tags_opt, SHUTDOWN_TIMEOUT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
1563 1568
    "<instance>", "Reboots an instance"),
1564 1569
  "activate-disks": (
1565 1570
    ActivateDisks, ARGS_ONE_INSTANCE,
1566
    [SUBMIT_OPT, IGNORE_SIZE_OPT, PRIORITY_OPT, WFSYNC_OPT],
1571
    SUBMIT_OPTS + [IGNORE_SIZE_OPT, PRIORITY_OPT, WFSYNC_OPT],
1567 1572
    "<instance>", "Activate an instance's disks"),
1568 1573
  "deactivate-disks": (
1569 1574
    DeactivateDisks, ARGS_ONE_INSTANCE,
1570
    [FORCE_OPT, SUBMIT_OPT, DRY_RUN_OPT, PRIORITY_OPT],
1575
    [FORCE_OPT] + SUBMIT_OPTS + [DRY_RUN_OPT, PRIORITY_OPT],
1571 1576
    "[-f] <instance>", "Deactivate an instance's disks"),
1572 1577
  "recreate-disks": (
1573 1578
    RecreateDisks, ARGS_ONE_INSTANCE,
1574
    [SUBMIT_OPT, DISK_OPT, NODE_PLACEMENT_OPT, DRY_RUN_OPT, PRIORITY_OPT,
1579
    SUBMIT_OPTS +
1580
    [DISK_OPT, NODE_PLACEMENT_OPT, DRY_RUN_OPT, PRIORITY_OPT,
1575 1581
     IALLOCATOR_OPT],
1576 1582
    "<instance>", "Recreate an instance's disks"),
1577 1583
  "grow-disk": (
1578 1584
    GrowDisk,
1579 1585
    [ArgInstance(min=1, max=1), ArgUnknown(min=1, max=1),
1580 1586
     ArgUnknown(min=1, max=1)],
1581
    [SUBMIT_OPT, NWSYNC_OPT, DRY_RUN_OPT, PRIORITY_OPT, ABSOLUTE_OPT],
1587
    SUBMIT_OPTS + [NWSYNC_OPT, DRY_RUN_OPT, PRIORITY_OPT, ABSOLUTE_OPT],
1582 1588
    "<instance> <disk> <size>", "Grow an instance's disk"),
1583 1589
  "change-group": (
1584 1590
    ChangeGroup, ARGS_ONE_INSTANCE,
1585
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT, PRIORITY_OPT, SUBMIT_OPT],
1591
    [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT, PRIORITY_OPT]
1592
    + SUBMIT_OPTS,
1586 1593
    "[-I <iallocator>] [--to <group>]", "Change group of instance"),
1587 1594
  "list-tags": (
1588 1595
    ListTags, ARGS_ONE_INSTANCE, [],
1589 1596
    "<instance_name>", "List the tags of the given instance"),
1590 1597
  "add-tags": (
1591 1598
    AddTags, [ArgInstance(min=1, max=1), ArgUnknown()],
1592
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1599
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1593 1600
    "<instance_name> tag...", "Add tags to the given instance"),
1594 1601
  "remove-tags": (
1595 1602
    RemoveTags, [ArgInstance(min=1, max=1), ArgUnknown()],
1596
    [TAG_SRC_OPT, PRIORITY_OPT, SUBMIT_OPT],
1603
    [TAG_SRC_OPT, PRIORITY_OPT] + SUBMIT_OPTS,
1597 1604
    "<instance_name> tag...", "Remove tags from given instance"),
1598 1605
  }
1599 1606

  

Also available in: Unified diff