X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/a379d9bdbe151c49fb9f04e26527f5ad0fd3eaf0..b757f8307de2e61291cd3cc0221502113b1e1ad6:/scripts/gnt-instance?ds=sidebyside diff --git a/scripts/gnt-instance b/scripts/gnt-instance index 3ac16d7..4980614 100755 --- a/scripts/gnt-instance +++ b/scripts/gnt-instance @@ -27,7 +27,7 @@ import sys import os import itertools import simplejson -from optparse import make_option +import time from cStringIO import StringIO from ganeti.cli import * @@ -160,7 +160,7 @@ def _EnsureInstancesExist(client, names): This function will raise an OpPrereqError in case they don't exist. Otherwise it will exit cleanly. - @type client: L{luxi.Client} + @type client: L{ganeti.luxi.Client} @param client: the client to use for the query @type names: list @param names: the list of instance names to query @@ -220,11 +220,13 @@ def ListInstances(opts, args): "hvparams": "Hypervisor_parameters", "be/memory": "Configured_memory", "be/vcpus": "VCPUs", + "vcpus": "VCPUs", "be/auto_balance": "Auto_balance", "disk.count": "Disks", "disk.sizes": "Disk_sizes", "nic.count": "NICs", "nic.ips": "NIC_IPs", "nic.modes": "NIC_modes", "nic.links": "NIC_links", "nic.bridges": "NIC_bridges", "nic.macs": "NIC_MACs", + "ctime": "CTime", "mtime": "MTime", } else: headers = None @@ -259,6 +261,8 @@ def ListInstances(opts, args): elif field == "sda_size" or field == "sdb_size": if val is None: val = "N/A" + elif field == "ctime" or field == "mtime": + val = utils.FormatTime(val) elif field in list_type_fields: val = ",".join(str(item) for item in val) elif val is None: @@ -302,6 +306,9 @@ def AddInstance(opts, args): nics = [{}] * nic_max for nidx, ndict in opts.nics: nidx = int(nidx) + if not isinstance(ndict, dict): + msg = "Invalid nic/%d value: expected dict, got %s" % (nidx, ndict) + raise errors.OpPrereqError(msg) nics[nidx] = ndict elif opts.no_nics: # no nics @@ -330,7 +337,10 @@ def AddInstance(opts, args): disks = [{}] * disk_max for didx, ddict in opts.disks: didx = int(didx) - if "size" not in ddict: + if not isinstance(ddict, dict): + msg = "Invalid disk/%d value: expected dict, got %s" % (didx, ddict) + raise errors.OpPrereqError(msg) + elif "size" not in ddict: raise errors.OpPrereqError("Missing size for disk %d" % didx) try: ddict["size"] = utils.ParseUnit(ddict["size"]) @@ -433,9 +443,7 @@ def BatchCreate(opts, args): json_filename = args[0] try: - fd = open(json_filename, 'r') - instance_data = simplejson.load(fd) - fd.close() + instance_data = simplejson.loads(utils.ReadFile(json_filename)) except Exception, err: ToStderr("Can't parse the instance definition file: %s" % str(err)) return 1 @@ -644,7 +652,8 @@ def ActivateDisks(opts, args): """ instance_name = args[0] - op = opcodes.OpActivateInstanceDisks(instance_name=instance_name) + op = opcodes.OpActivateInstanceDisks(instance_name=instance_name, + ignore_size=opts.ignore_size) disks_info = SubmitOrSend(op, opts) for host, iname, nname in disks_info: ToStdout("%s:%s:%s", host, iname, nname) @@ -652,7 +661,7 @@ def ActivateDisks(opts, args): def DeactivateDisks(opts, args): - """Deactivate an instance's disks.. + """Deactivate an instance's disks. This function takes the instance name, looks for its primary node and the tries to shutdown its block devices on that node. @@ -670,6 +679,32 @@ def DeactivateDisks(opts, args): return 0 +def RecreateDisks(opts, args): + """Recreate an instance's disks. + + @param opts: the command line options selected by the user + @type args: list + @param args: should contain only one element, the instance name + @rtype: int + @return: the desired exit code + + """ + instance_name = args[0] + if opts.disks: + try: + opts.disks = [int(v) for v in opts.disks.split(",")] + except (ValueError, TypeError), err: + ToStderr("Invalid disks value: %s" % str(err)) + return 1 + else: + opts.disks = [] + + op = opcodes.OpRecreateInstanceDisks(instance_name=instance_name, + disks=opts.disks) + SubmitOrSend(op, opts) + return 0 + + def GrowDisk(opts, args): """Grow an instance's disks. @@ -819,15 +854,20 @@ def ReplaceDisks(opts, args): disks = [int(i) for i in opts.disks.split(",")] except ValueError, err: raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err)) - cnt = [opts.on_primary, opts.on_secondary, + cnt = [opts.on_primary, opts.on_secondary, opts.auto, new_2ndary is not None, iallocator is not None].count(True) if cnt != 1: - raise errors.OpPrereqError("One and only one of the -p, -s, -n and -i" + raise errors.OpPrereqError("One and only one of the -p, -s, -a, -n and -i" " options must be passed") elif opts.on_primary: mode = constants.REPLACE_DISK_PRI elif opts.on_secondary: mode = constants.REPLACE_DISK_SEC + elif opts.auto: + mode = constants.REPLACE_DISK_AUTO + if disks: + raise errors.OpPrereqError("Cannot specify disks when using automatic" + " mode") elif new_2ndary is not None or iallocator is not None: # replace secondary mode = constants.REPLACE_DISK_CHG @@ -909,6 +949,33 @@ def MigrateInstance(opts, args): return 0 +def MoveInstance(opts, args): + """Move an instance. + + @param opts: the command line options selected by the user + @type args: list + @param args: should contain only one element, the instance name + @rtype: int + @return: the desired exit code + + """ + cl = GetClient() + instance_name = args[0] + force = opts.force + + if not force: + usertext = ("Instance %s will be moved." + " This requires a shutdown of the instance. Continue?" % + (instance_name,)) + if not AskUser(usertext): + return 1 + + op = opcodes.OpMoveInstance(instance_name=instance_name, + target_node=opts.target_node) + SubmitOrSend(op, opts, cl=cl) + return 0 + + def ConnectToInstanceConsole(opts, args): """Connect to the console of an instance. @@ -988,7 +1055,7 @@ def _FormatBlockDevInfo(idx, top_level, dev, static): if not status: return "not active" txt = "" - (path, major, minor, syncp, estt, degr, ldisk) = status + (path, major, minor, syncp, estt, degr, ldisk_status) = status if major is None: major_string = "N/A" else: @@ -1013,13 +1080,15 @@ def _FormatBlockDevInfo(idx, top_level, dev, static): degr_text = "*DEGRADED*" else: degr_text = "ok" - if ldisk: + if ldisk_status == constants.LDS_FAULTY: ldisk_text = " *MISSING DISK*" + elif ldisk_status == constants.LDS_UNKNOWN: + ldisk_text = " *UNCERTAIN STATE*" else: ldisk_text = "" txt += (" %s, status %s%s" % (sync_text, degr_text, ldisk_text)) elif dtype == constants.LD_LV: - if ldisk: + if ldisk_status == constants.LDS_FAULTY: ldisk_text = " *FAILED* (failed drive?)" else: ldisk_text = "" @@ -1034,7 +1103,11 @@ def _FormatBlockDevInfo(idx, top_level, dev, static): txt = "disk %d" % idx else: txt = "child %d" % idx - d1 = ["- %s: %s" % (txt, dev["dev_type"])] + if isinstance(dev["size"], int): + nice_size = utils.FormatUnit(dev["size"], "h") + else: + nice_size = dev["size"] + d1 = ["- %s: %s, size %s" % (txt, dev["dev_type"], nice_size)] data = [] if top_level: data.append(("access mode", dev["mode"])) @@ -1091,6 +1164,7 @@ def _FormatList(buf, data, indent_level): elif isinstance(elem, list): _FormatList(buf, elem, indent_level+1) + def ShowInstanceConfig(opts, args): """Compute instance run-time status. @@ -1123,6 +1197,9 @@ def ShowInstanceConfig(opts, args): for instance_name in result: instance = result[instance_name] buf.write("Instance name: %s\n" % instance["name"]) + buf.write("Serial number: %s\n" % instance["serial_no"]) + buf.write("Creation time: %s\n" % utils.FormatTime(instance["ctime"])) + buf.write("Modification time: %s\n" % utils.FormatTime(instance["mtime"])) buf.write("State: configured to be %s" % instance["config_state"]) if not opts.static: buf.write(", actual state is %s" % instance["run_state"]) @@ -1252,148 +1329,164 @@ def SetInstanceParams(opts, args): # options used in more than one cmd -node_opt = make_option("-n", "--node", dest="node", help="Target node", - metavar="") +node_opt = cli_option("-n", "--node", dest="node", help="Target node", + metavar="", + completion_suggest=OPT_COMPL_ONE_NODE) os_opt = cli_option("-o", "--os-type", dest="os", help="What OS to run", - metavar="") + metavar="", + completion_suggest=OPT_COMPL_ONE_OS) # multi-instance selection options -m_force_multi = make_option("--force-multiple", dest="force_multi", - help="Do not ask for confirmation when more than" - " one instance is affected", - action="store_true", default=False) +m_force_multi = cli_option("--force-multiple", dest="force_multi", + help="Do not ask for confirmation when more than" + " one instance is affected", + action="store_true", default=False) -m_pri_node_opt = make_option("--primary", dest="multi_mode", - help="Filter by nodes (primary only)", - const=_SHUTDOWN_NODES_PRI, action="store_const") +m_pri_node_opt = cli_option("--primary", dest="multi_mode", + help="Filter by nodes (primary only)", + const=_SHUTDOWN_NODES_PRI, action="store_const") -m_sec_node_opt = make_option("--secondary", dest="multi_mode", - help="Filter by nodes (secondary only)", - const=_SHUTDOWN_NODES_SEC, action="store_const") +m_sec_node_opt = cli_option("--secondary", dest="multi_mode", + help="Filter by nodes (secondary only)", + const=_SHUTDOWN_NODES_SEC, action="store_const") -m_node_opt = make_option("--node", dest="multi_mode", - help="Filter by nodes (primary and secondary)", - const=_SHUTDOWN_NODES_BOTH, action="store_const") +m_node_opt = cli_option("--node", dest="multi_mode", + help="Filter by nodes (primary and secondary)", + const=_SHUTDOWN_NODES_BOTH, action="store_const") -m_clust_opt = make_option("--all", dest="multi_mode", - help="Select all instances in the cluster", - const=_SHUTDOWN_CLUSTER, action="store_const") +m_clust_opt = cli_option("--all", dest="multi_mode", + help="Select all instances in the cluster", + const=_SHUTDOWN_CLUSTER, action="store_const") -m_inst_opt = make_option("--instance", dest="multi_mode", - help="Filter by instance name [default]", - const=_SHUTDOWN_INSTANCES, action="store_const") +m_inst_opt = cli_option("--instance", dest="multi_mode", + help="Filter by instance name [default]", + const=_SHUTDOWN_INSTANCES, action="store_const") # this is defined separately due to readability only add_opts = [ DEBUG_OPT, - make_option("-n", "--node", dest="node", - help="Target node and optional secondary node", - metavar="[:]"), + cli_option("-n", "--node", dest="node", + help="Target node and optional secondary node", + metavar="[:]", + completion_suggest=OPT_COMPL_INST_ADD_NODES), os_opt, - keyval_option("-B", "--backend", dest="beparams", - type="keyval", default={}, - help="Backend parameters"), - make_option("-t", "--disk-template", dest="disk_template", - help="Custom disk setup (diskless, file, plain or drbd)", - default=None, metavar="TEMPL"), + cli_option("-B", "--backend", dest="beparams", + type="keyval", default={}, + help="Backend parameters"), + cli_option("-t", "--disk-template", dest="disk_template", + help="Custom disk setup (diskless, file, plain or drbd)", + default=None, metavar="TEMPL", + choices=list(constants.DISK_TEMPLATES)), cli_option("-s", "--os-size", dest="sd_size", help="Disk size for a" " single-disk configuration, when not using the --disk option," " in MiB unless a suffix is used", default=None, type="unit", metavar=""), - ikv_option("--disk", help="Disk information", + cli_option("--disk", help="Disk information", default=[], dest="disks", action="append", type="identkeyval"), - ikv_option("--net", help="NIC information", + cli_option("--net", help="NIC information", default=[], dest="nics", action="append", type="identkeyval"), - make_option("--no-nics", default=False, action="store_true", - help="Do not create any network cards for the instance"), - make_option("--no-wait-for-sync", dest="wait_for_sync", default=True, - action="store_false", help="Don't wait for sync (DANGEROUS!)"), - make_option("--no-start", dest="start", default=True, - action="store_false", help="Don't start the instance after" - " creation"), - make_option("--no-ip-check", dest="ip_check", default=True, - action="store_false", help="Don't check that the instance's IP" - " is alive (only valid with --no-start)"), - make_option("--file-storage-dir", dest="file_storage_dir", - help="Relative path under default cluster-wide file storage dir" - " to store file-based disks", default=None, - metavar=""), - make_option("--file-driver", dest="file_driver", help="Driver to use" - " for image files", default="loop", metavar=""), - make_option("-I", "--iallocator", metavar="", - help="Select nodes for the instance automatically using the" - " iallocator plugin", default=None, type="string"), - ikv_option("-H", "--hypervisor", dest="hypervisor", - help="Hypervisor and hypervisor options, in the format" - " hypervisor:option=value,option=value,...", default=None, - type="identkeyval"), + cli_option("--no-nics", default=False, action="store_true", + help="Do not create any network cards for the instance"), + cli_option("--no-wait-for-sync", dest="wait_for_sync", default=True, + action="store_false", help="Don't wait for sync (DANGEROUS!)"), + cli_option("--no-start", dest="start", default=True, + action="store_false", help="Don't start the instance after" + " creation"), + cli_option("--no-ip-check", dest="ip_check", default=True, + action="store_false", help="Don't check that the instance's IP" + " is alive (only valid with --no-start)"), + cli_option("--file-storage-dir", dest="file_storage_dir", + help="Relative path under default cluster-wide file storage dir" + " to store file-based disks", default=None, + metavar=""), + cli_option("--file-driver", dest="file_driver", help="Driver to use" + " for image files", default="loop", metavar="", + choices=list(constants.FILE_DRIVER)), + cli_option("-I", "--iallocator", metavar="", + help="Select nodes for the instance automatically using the" + " iallocator plugin", default=None, type="string", + completion_suggest=OPT_COMPL_ONE_IALLOCATOR), + cli_option("-H", "--hypervisor", dest="hypervisor", + help="Hypervisor and hypervisor options, in the format" + " hypervisor:option=value,option=value,...", default=None, + type="identkeyval"), SUBMIT_OPT, ] commands = { - 'add': (AddInstance, ARGS_ONE, add_opts, + 'add': (AddInstance, [ArgHost(min=1, max=1)], add_opts, "[...] -t disk-type -n node[:secondary-node] -o os-type ", "Creates and adds a new instance to the cluster"), - 'batch-create': (BatchCreate, ARGS_ONE, + 'batch-create': (BatchCreate, [ArgFile(min=1, max=1)], [DEBUG_OPT], "", "Create a bunch of instances based on specs in the file."), - 'console': (ConnectToInstanceConsole, ARGS_ONE, + 'console': (ConnectToInstanceConsole, ARGS_ONE_INSTANCE, [DEBUG_OPT, - make_option("--show-cmd", dest="show_command", - action="store_true", default=False, - help=("Show command instead of executing it"))], + cli_option("--show-cmd", dest="show_command", + action="store_true", default=False, + help=("Show command instead of executing it"))], "[--show-cmd] ", "Opens a console on the specified instance"), - 'failover': (FailoverInstance, ARGS_ONE, + 'failover': (FailoverInstance, ARGS_ONE_INSTANCE, [DEBUG_OPT, FORCE_OPT, - make_option("--ignore-consistency", dest="ignore_consistency", - action="store_true", default=False, - help="Ignore the consistency of the disks on" - " the secondary"), + cli_option("--ignore-consistency", dest="ignore_consistency", + action="store_true", default=False, + help="Ignore the consistency of the disks on" + " the secondary"), SUBMIT_OPT, ], "[-f] ", "Stops the instance and starts it on the backup node, using" " the remote mirror (only for instances of type drbd)"), - 'migrate': (MigrateInstance, ARGS_ONE, + 'migrate': (MigrateInstance, ARGS_ONE_INSTANCE, [DEBUG_OPT, FORCE_OPT, - make_option("--non-live", dest="live", - default=True, action="store_false", - help="Do a non-live migration (this usually means" - " freeze the instance, save the state," - " transfer and only then resume running on the" - " secondary node)"), - make_option("--cleanup", dest="cleanup", - default=False, action="store_true", - help="Instead of performing the migration, try to" - " recover from a failed cleanup. This is safe" - " to run even if the instance is healthy, but it" - " will create extra replication traffic and " - " disrupt briefly the replication (like during the" - " migration"), + cli_option("--non-live", dest="live", + default=True, action="store_false", + help="Do a non-live migration (this usually means" + " freeze the instance, save the state," + " transfer and only then resume running on the" + " secondary node)"), + cli_option("--cleanup", dest="cleanup", + default=False, action="store_true", + help="Instead of performing the migration, try to" + " recover from a failed cleanup. This is safe" + " to run even if the instance is healthy, but it" + " will create extra replication traffic and " + " disrupt briefly the replication (like during the" + " migration"), ], "[-f] ", "Migrate instance to its secondary node" " (only for instances of type drbd)"), - 'info': (ShowInstanceConfig, ARGS_ANY, + 'move': (MoveInstance, ARGS_ONE_INSTANCE, + [DEBUG_OPT, FORCE_OPT, SUBMIT_OPT, + cli_option("-n", "--new-node", dest="target_node", + help="Destinattion node", metavar="NODE", + default=None, + completion_suggest=OPT_COMPL_ONE_NODE), + ], + "[-f] ", + "Move instance to an arbitrary node" + " (only for instances of type file and lv)"), + 'info': (ShowInstanceConfig, ARGS_MANY_INSTANCES, [DEBUG_OPT, - make_option("-s", "--static", dest="static", - action="store_true", default=False, - help="Only show configuration data, not runtime data"), - make_option("--all", dest="show_all", - default=False, action="store_true", - help="Show info on all instances on the cluster." - " This can take a long time to run, use wisely."), + cli_option("-s", "--static", dest="static", + action="store_true", default=False, + help="Only show configuration data, not runtime data"), + cli_option("--all", dest="show_all", + default=False, action="store_true", + help="Show info on all instances on the cluster." + " This can take a long time to run, use wisely."), ], "[-s] {--all | ...}", "Show information on the specified instance(s)"), - 'list': (ListInstances, ARGS_ANY, + 'list': (ListInstances, ARGS_MANY_INSTANCES, [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, SYNC_OPT], "[...]", "Lists the instances and their status. The available fields are" @@ -1404,137 +1497,165 @@ commands = { " The default field" " list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS), ), - 'reinstall': (ReinstallInstance, ARGS_ANY, + 'reinstall': (ReinstallInstance, [ArgInstance(min=1)], [DEBUG_OPT, FORCE_OPT, os_opt, m_force_multi, m_node_opt, m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, - make_option("--select-os", dest="select_os", - action="store_true", default=False, - help="Interactive OS reinstall, lists available" - " OS templates for selection"), + cli_option("--select-os", dest="select_os", + action="store_true", default=False, + help="Interactive OS reinstall, lists available" + " OS templates for selection"), SUBMIT_OPT, ], "[-f] ", "Reinstall a stopped instance"), - 'remove': (RemoveInstance, ARGS_ONE, + 'remove': (RemoveInstance, ARGS_ONE_INSTANCE, [DEBUG_OPT, FORCE_OPT, - make_option("--ignore-failures", dest="ignore_failures", - action="store_true", default=False, - help=("Remove the instance from the cluster even" - " if there are failures during the removal" - " process (shutdown, disk removal, etc.)")), + cli_option("--ignore-failures", dest="ignore_failures", + action="store_true", default=False, + help=("Remove the instance from the cluster even" + " if there are failures during the removal" + " process (shutdown, disk removal, etc.)")), SUBMIT_OPT, ], "[-f] ", "Shuts down the instance and removes it"), - 'rename': (RenameInstance, ARGS_FIXED(2), + 'rename': (RenameInstance, + [ArgInstance(min=1, max=1), ArgHost(min=1, max=1)], [DEBUG_OPT, - make_option("--no-ip-check", dest="ignore_ip", - help="Do not check that the IP of the new name" - " is alive", - default=False, action="store_true"), + cli_option("--no-ip-check", dest="ignore_ip", + help="Do not check that the IP of the new name" + " is alive", + default=False, action="store_true"), SUBMIT_OPT, ], " ", "Rename the instance"), - 'replace-disks': (ReplaceDisks, ARGS_ONE, + 'replace-disks': (ReplaceDisks, ARGS_ONE_INSTANCE, [DEBUG_OPT, - make_option("-n", "--new-secondary", dest="new_secondary", - help=("New secondary node (for secondary" - " node change)"), metavar="NODE", - default=None), - make_option("-p", "--on-primary", dest="on_primary", - default=False, action="store_true", - help=("Replace the disk(s) on the primary" - " node (only for the drbd template)")), - make_option("-s", "--on-secondary", dest="on_secondary", - default=False, action="store_true", - help=("Replace the disk(s) on the secondary" - " node (only for the drbd template)")), - make_option("--disks", dest="disks", default=None, - help="Comma-separated list of disks" - " indices to replace (e.g. 0,2) (optional," - " defaults to all disks)"), - make_option("-I", "--iallocator", metavar="", - help="Select new secondary for the instance" - " automatically using the" - " iallocator plugin (enables" - " secondary node replacement)", - default=None, type="string"), + cli_option("-n", "--new-secondary", dest="new_secondary", + help=("New secondary node (for secondary" + " node change)"), metavar="NODE", + default=None, + completion_suggest=OPT_COMPL_ONE_NODE), + cli_option("-p", "--on-primary", dest="on_primary", + default=False, action="store_true", + help=("Replace the disk(s) on the primary" + " node (only for the drbd template)")), + cli_option("-s", "--on-secondary", dest="on_secondary", + default=False, action="store_true", + help=("Replace the disk(s) on the secondary" + " node (only for the drbd template)")), + cli_option("-a", "--auto", dest="auto", + default=False, action="store_true", + help=("Automatically replace faulty disks" + " (only for the drbd template)")), + cli_option("--disks", dest="disks", default=None, + help="Comma-separated list of disks" + " indices to replace (e.g. 0,2) (optional," + " defaults to all disks)"), + cli_option("-I", "--iallocator", metavar="", + help="Select new secondary for the instance" + " automatically using the" + " iallocator plugin (enables" + " secondary node replacement)", + default=None, type="string", + completion_suggest=OPT_COMPL_ONE_IALLOCATOR), SUBMIT_OPT, ], "[-s|-p|-n NODE|-I NAME] ", "Replaces all disks for the instance"), - 'modify': (SetInstanceParams, ARGS_ONE, + 'modify': (SetInstanceParams, ARGS_ONE_INSTANCE, [DEBUG_OPT, FORCE_OPT, - keyval_option("-H", "--hypervisor", type="keyval", - default={}, dest="hypervisor", - help="Change hypervisor parameters"), - keyval_option("-B", "--backend", type="keyval", - default={}, dest="beparams", - help="Change backend parameters"), - ikv_option("--disk", help="Disk changes", + cli_option("-H", "--hypervisor", type="keyval", + default={}, dest="hypervisor", + help="Change hypervisor parameters"), + cli_option("-B", "--backend", type="keyval", + default={}, dest="beparams", + help="Change backend parameters"), + cli_option("--disk", help="Disk changes", default=[], dest="disks", action="append", type="identkeyval"), - ikv_option("--net", help="NIC changes", + cli_option("--net", help="NIC changes", default=[], dest="nics", action="append", type="identkeyval"), SUBMIT_OPT, ], "", "Alters the parameters of an instance"), - 'shutdown': (ShutdownInstance, ARGS_ANY, + 'shutdown': (ShutdownInstance, [ArgInstance(min=1)], [DEBUG_OPT, m_node_opt, m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, m_force_multi, SUBMIT_OPT, ], "", "Stops an instance"), - 'startup': (StartupInstance, ARGS_ANY, + 'startup': (StartupInstance, [ArgInstance(min=1)], [DEBUG_OPT, FORCE_OPT, m_force_multi, m_node_opt, m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, SUBMIT_OPT, - keyval_option("-H", "--hypervisor", type="keyval", - default={}, dest="hvparams", - help="Temporary hypervisor parameters"), - keyval_option("-B", "--backend", type="keyval", - default={}, dest="beparams", - help="Temporary backend parameters"), + cli_option("-H", "--hypervisor", type="keyval", + default={}, dest="hvparams", + help="Temporary hypervisor parameters"), + cli_option("-B", "--backend", type="keyval", + default={}, dest="beparams", + help="Temporary backend parameters"), ], "", "Starts an instance"), - - 'reboot': (RebootInstance, ARGS_ANY, + 'reboot': (RebootInstance, [ArgInstance(min=1)], [DEBUG_OPT, m_force_multi, - make_option("-t", "--type", dest="reboot_type", - help="Type of reboot: soft/hard/full", - default=constants.INSTANCE_REBOOT_HARD, - type="string", metavar=""), - make_option("--ignore-secondaries", dest="ignore_secondaries", - default=False, action="store_true", - help="Ignore errors from secondaries"), + cli_option("-t", "--type", dest="reboot_type", + help="Type of reboot: soft/hard/full", + default=constants.INSTANCE_REBOOT_HARD, + metavar="", + choices=list(constants.REBOOT_TYPES)), + cli_option("--ignore-secondaries", dest="ignore_secondaries", + default=False, action="store_true", + help="Ignore errors from secondaries"), m_node_opt, m_pri_node_opt, m_sec_node_opt, m_clust_opt, m_inst_opt, SUBMIT_OPT, ], "", "Reboots an instance"), - 'activate-disks': (ActivateDisks, ARGS_ONE, [DEBUG_OPT, SUBMIT_OPT], + 'activate-disks': (ActivateDisks, ARGS_ONE_INSTANCE, + [DEBUG_OPT, SUBMIT_OPT, + cli_option("--ignore-size", dest="ignore_size", + default=False, action="store_true", + help="Ignore current recorded size" + " (useful for forcing activation when" + " the recorded size is wrong)"), + ], "", "Activate an instance's disks"), - 'deactivate-disks': (DeactivateDisks, ARGS_ONE, [DEBUG_OPT, SUBMIT_OPT], + 'deactivate-disks': (DeactivateDisks, ARGS_ONE_INSTANCE, + [DEBUG_OPT, SUBMIT_OPT], "", "Deactivate an instance's disks"), - 'grow-disk': (GrowDisk, ARGS_FIXED(3), + 'recreate-disks': (RecreateDisks, ARGS_ONE_INSTANCE, + [DEBUG_OPT, SUBMIT_OPT, + cli_option("--disks", dest="disks", default=None, + help="Comma-separated list of disks" + " indices to replace (e.g. 0,2) (optional," + " defaults to all disks)"), + ], + "", + "Recreate an instance's disks"), + 'grow-disk': (GrowDisk, + [ArgInstance(min=1, max=1), ArgUnknown(min=1, max=1), + ArgUnknown(min=1, max=1)], [DEBUG_OPT, SUBMIT_OPT, - make_option("--no-wait-for-sync", - dest="wait_for_sync", default=True, - action="store_false", - help="Don't wait for sync (DANGEROUS!)"), + cli_option("--no-wait-for-sync", + dest="wait_for_sync", default=True, + action="store_false", + help="Don't wait for sync (DANGEROUS!)"), ], " ", "Grow an instance's disk"), - 'list-tags': (ListTags, ARGS_ONE, [DEBUG_OPT], + 'list-tags': (ListTags, ARGS_ONE_INSTANCE, [DEBUG_OPT], "", "List the tags of the given instance"), - 'add-tags': (AddTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT], + 'add-tags': (AddTags, [ArgInstance(min=1, max=1), ArgUnknown()], + [DEBUG_OPT, TAG_SRC_OPT], " tag...", "Add tags to the given instance"), - 'remove-tags': (RemoveTags, ARGS_ATLEAST(1), [DEBUG_OPT, TAG_SRC_OPT], + 'remove-tags': (RemoveTags, [ArgInstance(min=1, max=1), ArgUnknown()], + [DEBUG_OPT, TAG_SRC_OPT], " tag...", "Remove tags from given instance"), } @@ -1546,6 +1667,7 @@ aliases = { 'stop': 'shutdown', } + if __name__ == '__main__': sys.exit(GenericMain(commands, aliases=aliases, override={"tag_type": constants.TAG_INSTANCE}))