]
-def _ExpandMultiNames(mode, names):
+def _ExpandMultiNames(mode, names, client=None):
"""Expand the given names using the passed mode.
For _SHUTDOWN_CLUSTER, all instances will be returned. For
@raise errors.OpPrereqError: for invalid input parameters
"""
+ if client is None:
+ client = GetClient()
if mode == _SHUTDOWN_CLUSTER:
if names:
raise errors.OpPrereqError("Cluster filter mode takes no arguments")
- client = GetClient()
- idata = client.QueryInstances([], ["name"])
+ idata = client.QueryInstances([], ["name"], False)
inames = [row[0] for row in idata]
elif mode in (_SHUTDOWN_NODES_BOTH,
_SHUTDOWN_NODES_SEC):
if not names:
raise errors.OpPrereqError("No node names passed")
- client = GetClient()
- ndata = client.QueryNodes(names, ["name", "pinst_list", "sinst_list"])
+ ndata = client.QueryNodes(names, ["name", "pinst_list", "sinst_list"],
+ False)
ipri = [row[1] for row in ndata]
pri_names = list(itertools.chain(*ipri))
isec = [row[2] for row in ndata]
elif mode == _SHUTDOWN_INSTANCES:
if not names:
raise errors.OpPrereqError("No instance names passed")
- client = GetClient()
- idata = client.QueryInstances(names, ["name"])
+ idata = client.QueryInstances(names, ["name"], False)
inames = [row[0] for row in idata]
else:
return inames
-def _ConfirmOperation(inames, text):
+def _ConfirmOperation(inames, text, extra=""):
"""Ask the user to confirm an operation on a list of instances.
This function is used to request confirmation for doing an operation
"""
count = len(inames)
- msg = ("The %s will operate on %d instances.\n"
- "Do you want to continue?" % (text, count))
+ msg = ("The %s will operate on %d instances.\n%s"
+ "Do you want to continue?" % (text, count, extra))
affected = ("\nAffected instances:\n" +
"\n".join([" %s" % name for name in inames]))
return choice
-def _TransformPath(user_input):
- """Transform a user path into a canonical value.
+def _EnsureInstancesExist(client, names):
+ """Check for and ensure the given instance names exist.
- This function transforms the a path passed as textual information
- into the constants that the LU code expects.
+ This function will raise an OpPrereqError in case they don't
+ exist. Otherwise it will exit cleanly.
- """
- if user_input:
- if user_input.lower() == "default":
- result_path = constants.VALUE_DEFAULT
- elif user_input.lower() == "none":
- result_path = constants.VALUE_NONE
- else:
- if not os.path.isabs(user_input):
- raise errors.OpPrereqError("Path '%s' is not an absolute filename" %
- user_input)
- result_path = user_input
- else:
- result_path = constants.VALUE_DEFAULT
+ @type client: L{luxi.Client}
+ @param client: the client to use for the query
+ @type names: list
+ @param names: the list of instance names to query
+ @raise errors.OpPrereqError: in case any instance is missing
- return result_path
+ """
+ # TODO: change LUQueryInstances to that it actually returns None
+ # instead of raising an exception, or devise a better mechanism
+ result = client.QueryInstances(names, ["name"], False)
+ for orig_name, row in zip(names, result):
+ if row[0] is None:
+ raise errors.OpPrereqError("Instance '%s' does not exist" % orig_name)
def ListInstances(opts, args):
else:
selected_fields = opts.output.split(",")
- output = GetClient().QueryInstances([], selected_fields)
+ output = GetClient().QueryInstances(args, selected_fields, opts.do_locking)
if not opts.no_headers:
headers = {
"ip": "IP_address", "mac": "MAC_address",
"bridge": "Bridge",
"sda_size": "Disk/0", "sdb_size": "Disk/1",
+ "disk_usage": "DiskUsage",
"status": "Status", "tags": "Tags",
"network_port": "Network_port",
"hv/kernel_path": "Kernel_path",
except ValueError, err:
raise errors.OpPrereqError("Invalid NIC index passed: %s" % str(err))
nics = [{}] * nic_max
- for nidx, ndict in opts.nics.items():
+ for nidx, ndict in opts.nics:
nidx = int(nidx)
nics[nidx] = ndict
elif opts.no_nics:
nics = [{}]
if opts.disk_template == constants.DT_DISKLESS:
- if opts.disks:
+ if opts.disks or opts.sd_size is not None:
raise errors.OpPrereqError("Diskless instance but disk"
" information passed")
disks = []
else:
- if not opts.disks:
+ if not opts.disks and not opts.sd_size:
raise errors.OpPrereqError("No disk information specified")
+ if opts.disks and opts.sd_size is not None:
+ raise errors.OpPrereqError("Please use either the '--disk' or"
+ " '-s' option")
+ if opts.sd_size is not None:
+ opts.disks = [(0, {"size": opts.sd_size})]
try:
disk_max = max(int(didx[0])+1 for didx in opts.disks)
except ValueError, err:
(didx, err))
disks[didx] = ddict
- ValidateBeParams(opts.beparams)
-
-## kernel_path = _TransformPath(opts.kernel_path)
-## initrd_path = _TransformPath(opts.initrd_path)
-
-## hvm_acpi = opts.hvm_acpi == _VALUE_TRUE
-## hvm_pae = opts.hvm_pae == _VALUE_TRUE
-
-## if ((opts.hvm_cdrom_image_path is not None) and
-## (opts.hvm_cdrom_image_path.lower() == constants.VALUE_NONE)):
-## hvm_cdrom_image_path = None
-## else:
-## hvm_cdrom_image_path = opts.hvm_cdrom_image_path
+ utils.ForceDictType(opts.beparams, constants.BES_PARAMETER_TYPES)
+ utils.ForceDictType(hvparams, constants.HVS_PARAMETER_TYPES)
op = opcodes.OpCreateInstance(instance_name=instance,
disks=disks,
in the form::
{"instance-name":{
- "disk_size": 25,
- "swap_size": 1024,
+ "disk_size": [20480],
"template": "drbd",
"backend": {
"memory": 512,
"vcpus": 1 },
- "os": "etch-image",
+ "os": "debootstrap",
"primary_node": "firstnode",
"secondary_node": "secondnode",
"iallocator": "dumb"}
@return: the desired exit code
"""
- _DEFAULT_SPECS = {"disk_size": 20 * 1024,
- "swap_size": 4 * 1024,
+ _DEFAULT_SPECS = {"disk_size": [20 * 1024],
"backend": {},
"iallocator": None,
"primary_node": None,
"start": True,
"ip_check": True,
"hypervisor": None,
+ "hvparams": {},
"file_storage_dir": None,
"file_driver": 'loop'}
raise errors.OpPrereqError('You have to provide at least a primary_node'
' or an iallocator.')
- if (spec['hypervisor'] and
- not isinstance(spec['hypervisor'], dict)):
+ if (spec['hvparams'] and
+ not isinstance(spec['hvparams'], dict)):
raise errors.OpPrereqError('Hypervisor parameters must be a dict.')
json_filename = args[0]
- fd = open(json_filename, 'r')
try:
+ fd = open(json_filename, 'r')
instance_data = simplejson.load(fd)
- finally:
fd.close()
+ except Exception, err:
+ ToStderr("Can't parse the instance definition file: %s" % str(err))
+ return 1
+
+ jex = JobExecutor()
# Iterate over the instances and do:
# * Populate the specs with default value
# * Validate the instance specs
- for (name, specs) in instance_data.iteritems():
+ i_names = utils.NiceSort(instance_data.keys())
+ for name in i_names:
+ specs = instance_data[name]
specs = _PopulateWithDefaults(specs)
_Validate(specs)
- hypervisor = None
- hvparams = {}
- if specs['hypervisor']:
- hypervisor, hvparams = specs['hypervisor'].iteritems()
+ hypervisor = specs['hypervisor']
+ hvparams = specs['hvparams']
+
+ disks = []
+ for elem in specs['disk_size']:
+ try:
+ size = utils.ParseUnit(elem)
+ except ValueError, err:
+ raise errors.OpPrereqError("Invalid disk size '%s' for"
+ " instance %s: %s" %
+ (elem, name, err))
+ disks.append({"size": size})
+
+ nic0 = {'ip': specs['ip'], 'bridge': specs['bridge'], 'mac': specs['mac']}
+
+ utils.ForceDictType(specs['backend'], constants.BES_PARAMETER_TYPES)
+ utils.ForceDictType(hvparams, constants.HVS_PARAMETER_TYPES)
op = opcodes.OpCreateInstance(instance_name=name,
- disk_size=specs['disk_size'],
- swap_size=specs['swap_size'],
+ disks=disks,
disk_template=specs['template'],
mode=constants.INSTANCE_CREATE,
os_type=specs['os'],
pnode=specs['primary_node'],
snode=specs['secondary_node'],
- ip=specs['ip'], bridge=specs['bridge'],
+ nics=[nic0],
start=specs['start'],
ip_check=specs['ip_check'],
wait_for_sync=True,
- mac=specs['mac'],
iallocator=specs['iallocator'],
hypervisor=hypervisor,
hvparams=hvparams,
file_storage_dir=specs['file_storage_dir'],
file_driver=specs['file_driver'])
- ToStdout("%s: %s", name, cli.SendJob([op]))
+ jex.QueueJob(name, op)
+ # we never want to wait, just show the submitted job IDs
+ jex.WaitOrShow(False)
return 0
@return: the desired exit code
"""
- instance_name = args[0]
+ # first, compute the desired name list
+ if opts.multi_mode is None:
+ opts.multi_mode = _SHUTDOWN_INSTANCES
+ inames = _ExpandMultiNames(opts.multi_mode, args)
+ if not inames:
+ raise errors.OpPrereqError("Selection filter does not match any instances")
+
+ # second, if requested, ask for an OS
if opts.select_os is True:
op = opcodes.OpDiagnoseOS(output_fields=["name", "valid"], names=[])
result = SubmitOpCode(op)
number = number + 1
choices.append(('x', 'exit', 'Exit gnt-instance reinstall'))
- selected = AskUser("Enter OS template name or number (or x to abort):",
+ selected = AskUser("Enter OS template number (or x to abort):",
choices)
if selected == 'exit':
- ToStdout("User aborted reinstall, exiting")
+ ToStderr("User aborted reinstall, exiting")
return 1
os_name = selected
else:
os_name = opts.os
- if not opts.force:
- usertext = ("This will reinstall the instance %s and remove"
- " all data. Continue?") % instance_name
- if not AskUser(usertext):
+ # third, get confirmation: multi-reinstall requires --force-multi
+ # *and* --force, single-reinstall just --force
+ multi_on = opts.multi_mode != _SHUTDOWN_INSTANCES or len(inames) > 1
+ if multi_on:
+ warn_msg = "Note: this will remove *all* data for the below instances!\n"
+ if not ((opts.force_multi and opts.force) or
+ _ConfirmOperation(inames, "reinstall", extra=warn_msg)):
return 1
-
- op = opcodes.OpReinstallInstance(instance_name=instance_name,
- os_type=os_name)
- SubmitOrSend(op, opts)
-
+ else:
+ if not opts.force:
+ usertext = ("This will reinstall the instance %s and remove"
+ " all data. Continue?") % instance_name
+ if not AskUser(usertext):
+ return 1
+
+ jex = JobExecutor(verbose=multi_on)
+ for instance_name in inames:
+ op = opcodes.OpReinstallInstance(instance_name=instance_name,
+ os_type=os_name)
+ jex.QueueJob(instance_name, op)
+
+ jex.WaitOrShow(not opts.submit_only)
return 0
"""
instance_name = args[0]
force = opts.force
+ cl = GetClient()
if not force:
+ _EnsureInstancesExist(cl, [instance_name])
+
usertext = ("This will remove the volumes of the instance %s"
" (including mirrors), thus removing all the data"
" of the instance. Continue?") % instance_name
op = opcodes.OpRemoveInstance(instance_name=instance_name,
ignore_failures=opts.ignore_failures)
- SubmitOrSend(op, opts)
+ SubmitOrSend(op, opts, cl=cl)
return 0
@return: the desired exit code
"""
+ cl = GetClient()
if opts.multi_mode is None:
opts.multi_mode = _SHUTDOWN_INSTANCES
- inames = _ExpandMultiNames(opts.multi_mode, args)
+ inames = _ExpandMultiNames(opts.multi_mode, args, client=cl)
if not inames:
raise errors.OpPrereqError("Selection filter does not match any instances")
multi_on = opts.multi_mode != _SHUTDOWN_INSTANCES or len(inames) > 1
if not (opts.force_multi or not multi_on
or _ConfirmOperation(inames, "startup")):
return 1
+ jex = cli.JobExecutor(verbose=multi_on, cl=cl)
for name in inames:
op = opcodes.OpStartupInstance(instance_name=name,
- force=opts.force,
- extra_args=opts.extra_args)
- if multi_on:
- ToStdout("Starting up %s", name)
- try:
- SubmitOrSend(op, opts)
- except JobSubmittedException, err:
- _, txt = FormatError(err)
- ToStdout("%s", txt)
+ force=opts.force)
+ # do not add these parameters to the opcode unless they're defined
+ if opts.hvparams:
+ op.hvparams = opts.hvparams
+ if opts.beparams:
+ op.beparams = opts.beparams
+ jex.QueueJob(name, op)
+ jex.WaitOrShow(not opts.submit_only)
return 0
@return: the desired exit code
"""
+ cl = GetClient()
if opts.multi_mode is None:
opts.multi_mode = _SHUTDOWN_INSTANCES
- inames = _ExpandMultiNames(opts.multi_mode, args)
+ inames = _ExpandMultiNames(opts.multi_mode, args, client=cl)
if not inames:
raise errors.OpPrereqError("Selection filter does not match any instances")
multi_on = opts.multi_mode != _SHUTDOWN_INSTANCES or len(inames) > 1
if not (opts.force_multi or not multi_on
or _ConfirmOperation(inames, "reboot")):
return 1
+ jex = JobExecutor(verbose=multi_on, cl=cl)
for name in inames:
op = opcodes.OpRebootInstance(instance_name=name,
reboot_type=opts.reboot_type,
ignore_secondaries=opts.ignore_secondaries)
-
- SubmitOrSend(op, opts)
+ jex.QueueJob(name, op)
+ jex.WaitOrShow(not opts.submit_only)
return 0
@return: the desired exit code
"""
+ cl = GetClient()
if opts.multi_mode is None:
opts.multi_mode = _SHUTDOWN_INSTANCES
- inames = _ExpandMultiNames(opts.multi_mode, args)
+ inames = _ExpandMultiNames(opts.multi_mode, args, client=cl)
if not inames:
raise errors.OpPrereqError("Selection filter does not match any instances")
multi_on = opts.multi_mode != _SHUTDOWN_INSTANCES or len(inames) > 1
if not (opts.force_multi or not multi_on
or _ConfirmOperation(inames, "shutdown")):
return 1
+
+ jex = cli.JobExecutor(verbose=multi_on, cl=cl)
for name in inames:
op = opcodes.OpShutdownInstance(instance_name=name)
- if multi_on:
- ToStdout("Shutting down %s", name)
- try:
- SubmitOrSend(op, opts)
- except JobSubmittedException, err:
- _, txt = FormatError(err)
- ToStdout("%s", txt)
+ jex.QueueJob(name, op)
+ jex.WaitOrShow(not opts.submit_only)
return 0
disks = [int(i) for i in opts.disks.split(",")]
except ValueError, err:
raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err))
- if opts.on_primary == opts.on_secondary: # no -p or -s passed, or both passed
- mode = constants.REPLACE_DISK_ALL
- elif opts.on_primary: # only on primary:
+ cnt = [opts.on_primary, opts.on_secondary,
+ 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"
+ " options must be passed")
+ elif opts.on_primary:
mode = constants.REPLACE_DISK_PRI
- if new_2ndary is not None or iallocator is not None:
- raise errors.OpPrereqError("Can't change secondary node on primary disk"
- " replacement")
- elif opts.on_secondary is not None or iallocator is not None:
- # only on secondary
+ elif opts.on_secondary:
mode = constants.REPLACE_DISK_SEC
+ elif new_2ndary is not None or iallocator is not None:
+ # replace secondary
+ mode = constants.REPLACE_DISK_CHG
op = opcodes.OpReplaceDisks(instance_name=args[0], disks=disks,
remote_node=new_2ndary, mode=mode,
@return: the desired exit code
"""
+ cl = GetClient()
instance_name = args[0]
force = opts.force
if not force:
+ _EnsureInstancesExist(cl, [instance_name])
+
usertext = ("Failover will happen to image %s."
" This requires a shutdown of the instance. Continue?" %
(instance_name,))
op = opcodes.OpFailoverInstance(instance_name=instance_name,
ignore_consistency=opts.ignore_consistency)
- SubmitOrSend(op, opts)
+ SubmitOrSend(op, opts, cl=cl)
+ return 0
+
+
+def MigrateInstance(opts, args):
+ """Migrate an instance.
+
+ The migrate is done without shutdown.
+
+ @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:
+ _EnsureInstancesExist(cl, [instance_name])
+
+ if opts.cleanup:
+ usertext = ("Instance %s will be recovered from a failed migration."
+ " Note that the migration procedure (including cleanup)" %
+ (instance_name,))
+ else:
+ usertext = ("Instance %s will be migrated. Note that migration" %
+ (instance_name,))
+ usertext += (" is **experimental** in this version."
+ " This might impact the instance if anything goes wrong."
+ " Continue?")
+ if not AskUser(usertext):
+ return 1
+
+ op = opcodes.OpMigrateInstance(instance_name=instance_name, live=opts.live,
+ cleanup=opts.cleanup)
+ SubmitOpCode(op, cl=cl)
return 0
os._exit(1)
-def _FormatBlockDevInfo(buf, dev, indent_level, static):
+def _FormatLogicalID(dev_type, logical_id):
+ """Formats the logical_id of a disk.
+
+ """
+ if dev_type == constants.LD_DRBD8:
+ node_a, node_b, port, minor_a, minor_b, key = logical_id
+ data = [
+ ("nodeA", "%s, minor=%s" % (node_a, minor_a)),
+ ("nodeB", "%s, minor=%s" % (node_b, minor_b)),
+ ("port", port),
+ ("auth key", key),
+ ]
+ elif dev_type == constants.LD_LV:
+ vg_name, lv_name = logical_id
+ data = ["%s/%s" % (vg_name, lv_name)]
+ else:
+ data = [str(logical_id)]
+
+ return data
+
+
+def _FormatBlockDevInfo(idx, top_level, dev, static):
"""Show block device information.
This is only used by L{ShowInstanceConfig}, but it's too big to be
left for an inline definition.
- @type buf: StringIO
- @param buf: buffer that will accumulate the output
+ @type idx: int
+ @param idx: the index of the current disk
+ @type top_level: boolean
+ @param top_level: if this a top-level disk?
@type dev: dict
@param dev: dictionary with disk information
- @type indent_level: int
- @param indent_level: the indendation level we are at, used for
- the layout of the device tree
@type static: boolean
@param static: wheter the device information doesn't contain
runtime information but only static data
+ @return: a list of either strings, tuples or lists
+ (which should be formatted at a higher indent level)
"""
- def helper(buf, dtype, status):
+ def helper(dtype, status):
"""Format one line for physical device status.
- @type buf: StringIO
- @param buf: buffer that will accumulate the output
@type dtype: str
@param dtype: a constant from the L{constants.LDS_BLOCK} set
@type status: tuple
@param status: a tuple as returned from L{backend.FindBlockDevice}
+ @return: the string representing the status
"""
if not status:
- buf.write("not active\n")
+ return "not active"
+ txt = ""
+ (path, major, minor, syncp, estt, degr, ldisk) = status
+ if major is None:
+ major_string = "N/A"
else:
- (path, major, minor, syncp, estt, degr, ldisk) = status
- if major is None:
- major_string = "N/A"
- else:
- major_string = str(major)
+ major_string = str(major)
- if minor is None:
- minor_string = "N/A"
- else:
- minor_string = str(minor)
-
- buf.write("%s (%s:%s)" % (path, major_string, minor_string))
- if dtype in (constants.LD_DRBD8, ):
- if syncp is not None:
- sync_text = "*RECOVERING* %5.2f%%," % syncp
- if estt:
- sync_text += " ETA %ds" % estt
- else:
- sync_text += " ETA unknown"
- else:
- sync_text = "in sync"
- if degr:
- degr_text = "*DEGRADED*"
- else:
- degr_text = "ok"
- if ldisk:
- ldisk_text = " *MISSING DISK*"
- else:
- ldisk_text = ""
- buf.write(" %s, status %s%s" % (sync_text, degr_text, ldisk_text))
- elif dtype == constants.LD_LV:
- if ldisk:
- ldisk_text = " *FAILED* (failed drive?)"
+ if minor is None:
+ minor_string = "N/A"
+ else:
+ minor_string = str(minor)
+
+ txt += ("%s (%s:%s)" % (path, major_string, minor_string))
+ if dtype in (constants.LD_DRBD8, ):
+ if syncp is not None:
+ sync_text = "*RECOVERING* %5.2f%%," % syncp
+ if estt:
+ sync_text += " ETA %ds" % estt
else:
- ldisk_text = ""
- buf.write(ldisk_text)
- buf.write("\n")
-
- if dev["iv_name"] is not None:
- data = " - %s, " % dev["iv_name"]
+ sync_text += " ETA unknown"
+ else:
+ sync_text = "in sync"
+ if degr:
+ degr_text = "*DEGRADED*"
+ else:
+ degr_text = "ok"
+ if ldisk:
+ ldisk_text = " *MISSING DISK*"
+ else:
+ ldisk_text = ""
+ txt += (" %s, status %s%s" % (sync_text, degr_text, ldisk_text))
+ elif dtype == constants.LD_LV:
+ if ldisk:
+ ldisk_text = " *FAILED* (failed drive?)"
+ else:
+ ldisk_text = ""
+ txt += ldisk_text
+ return txt
+
+ # the header
+ if top_level:
+ if dev["iv_name"] is not None:
+ txt = dev["iv_name"]
+ else:
+ txt = "disk %d" % idx
else:
- data = " - "
- data += "access mode: %s, " % dev["mode"]
- data += "type: %s" % dev["dev_type"]
+ txt = "child %d" % idx
+ d1 = ["- %s: %s" % (txt, dev["dev_type"])]
+ data = []
+ if top_level:
+ data.append(("access mode", dev["mode"]))
if dev["logical_id"] is not None:
- data += ", logical_id: %s" % (dev["logical_id"],)
+ try:
+ l_id = _FormatLogicalID(dev["dev_type"], dev["logical_id"])
+ except ValueError:
+ l_id = [str(dev["logical_id"])]
+ if len(l_id) == 1:
+ data.append(("logical_id", l_id[0]))
+ else:
+ data.extend(l_id)
elif dev["physical_id"] is not None:
- data += ", physical_id: %s" % (dev["physical_id"],)
- buf.write("%*s%s\n" % (2*indent_level, "", data))
+ data.append("physical_id:")
+ data.append([dev["physical_id"]])
if not static:
- buf.write("%*s primary: " % (2*indent_level, ""))
- helper(buf, dev["dev_type"], dev["pstatus"])
-
+ data.append(("on primary", helper(dev["dev_type"], dev["pstatus"])))
if dev["sstatus"] and not static:
- buf.write("%*s secondary: " % (2*indent_level, ""))
- helper(buf, dev["dev_type"], dev["sstatus"])
+ data.append(("on secondary", helper(dev["dev_type"], dev["sstatus"])))
if dev["children"]:
- for child in dev["children"]:
- _FormatBlockDevInfo(buf, child, indent_level+1, static)
+ data.append("child devices:")
+ for c_idx, child in enumerate(dev["children"]):
+ data.append(_FormatBlockDevInfo(c_idx, False, child, static))
+ d1.append(data)
+ return d1
+def _FormatList(buf, data, indent_level):
+ """Formats a list of data at a given indent level.
+
+ If the element of the list is:
+ - a string, it is simply formatted as is
+ - a tuple, it will be split into key, value and the all the
+ values in a list will be aligned all at the same start column
+ - a list, will be recursively formatted
+
+ @type buf: StringIO
+ @param buf: the buffer into which we write the output
+ @param data: the list to format
+ @type indent_level: int
+ @param indent_level: the indent level to format at
+
+ """
+ max_tlen = max([len(elem[0]) for elem in data
+ if isinstance(elem, tuple)] or [0])
+ for elem in data:
+ if isinstance(elem, basestring):
+ buf.write("%*s%s\n" % (2*indent_level, "", elem))
+ elif isinstance(elem, tuple):
+ key, value = elem
+ spacer = "%*s" % (max_tlen - len(key), "")
+ buf.write("%*s%s:%s %s\n" % (2*indent_level, "", key, spacer, value))
+ elif isinstance(elem, list):
+ _FormatList(buf, elem, indent_level+1)
+
def ShowInstanceConfig(opts, args):
"""Compute instance run-time status.
@return: the desired exit code
"""
+ if not args and not opts.show_all:
+ ToStderr("No instance selected."
+ " Please pass in --all if you want to query all instances.\n"
+ "Note that this can take a long time on a big cluster.")
+ return 1
+ elif args and opts.show_all:
+ ToStderr("Cannot use --all if you specify instance names.")
+ return 1
+
retcode = 0
op = opcodes.OpQueryInstanceData(instances=args, static=opts.static)
result = SubmitOpCode(op)
if instance.has_key("network_port"):
buf.write(" Allocated network port: %s\n" % instance["network_port"])
buf.write(" Hypervisor: %s\n" % instance["hypervisor"])
- if instance["hypervisor"] == constants.HT_XEN_PVM:
- hvattrs = ((constants.HV_KERNEL_PATH, "kernel path"),
- (constants.HV_INITRD_PATH, "initrd path"))
- elif instance["hypervisor"] == constants.HT_XEN_HVM:
- hvattrs = ((constants.HV_BOOT_ORDER, "boot order"),
- (constants.HV_ACPI, "ACPI"),
- (constants.HV_PAE, "PAE"),
- (constants.HV_CDROM_IMAGE_PATH, "virtual CDROM"),
- (constants.HV_NIC_TYPE, "NIC type"),
- (constants.HV_DISK_TYPE, "Disk type"),
- (constants.HV_VNC_BIND_ADDRESS, "VNC bind address"),
- )
- # custom console information for HVM
- vnc_bind_address = instance["hv_actual"][constants.HV_VNC_BIND_ADDRESS]
- if vnc_bind_address == constants.BIND_ADDRESS_GLOBAL:
- vnc_console_port = "%s:%s" % (instance["pnode"],
- instance["network_port"])
- elif vnc_bind_address == constants.LOCALHOST_IP_ADDRESS:
- vnc_console_port = "%s:%s on node %s" % (vnc_bind_address,
- instance["network_port"],
- instance["pnode"])
+
+ # custom VNC console information
+ vnc_bind_address = instance["hv_actual"].get(constants.HV_VNC_BIND_ADDRESS,
+ None)
+ if vnc_bind_address:
+ port = instance["network_port"]
+ display = int(port) - constants.VNC_BASE_PORT
+ if display > 0 and vnc_bind_address == constants.BIND_ADDRESS_GLOBAL:
+ vnc_console_port = "%s:%s (display %s)" % (instance["pnode"],
+ port,
+ display)
+ elif display > 0 and utils.IsValidIP(vnc_bind_address):
+ vnc_console_port = ("%s:%s (node %s) (display %s)" %
+ (vnc_bind_address, port,
+ instance["pnode"], display))
else:
- vnc_console_port = "%s:%s" % (vnc_bind_address,
- instance["network_port"])
+ # vnc bind address is a file
+ vnc_console_port = "%s:%s" % (instance["pnode"],
+ vnc_bind_address)
buf.write(" - console connection: vnc to %s\n" % vnc_console_port)
- else:
- # auto-handle other hypervisor types
- hvattrs = [(key, key) for key in instance["hv_actual"]]
-
- for key, desc in hvattrs:
+ for key in instance["hv_actual"]:
if key in instance["hv_instance"]:
val = instance["hv_instance"][key]
else:
val = "default (%s)" % instance["hv_actual"][key]
- buf.write(" - %s: %s\n" % (desc, val))
+ buf.write(" - %s: %s\n" % (key, val))
buf.write(" Hardware:\n")
buf.write(" - VCPUs: %d\n" %
instance["be_actual"][constants.BE_VCPUS])
for idx, (mac, ip, bridge) in enumerate(instance["nics"]):
buf.write(" - nic/%d: MAC: %s, IP: %s, bridge: %s\n" %
(idx, mac, ip, bridge))
- buf.write(" Block devices:\n")
+ buf.write(" Disks:\n")
- for device in instance["disks"]:
- _FormatBlockDevInfo(buf, device, 1, opts.static)
+ for idx, device in enumerate(instance["disks"]):
+ _FormatList(buf, _FormatBlockDevInfo(idx, True, device, opts.static), 2)
ToStdout(buf.getvalue().rstrip('\n'))
return retcode
return 1
for param in opts.beparams:
- if opts.beparams[param].lower() == "default":
- opts.beparams[param] = constants.VALUE_DEFAULT
- elif opts.beparams[param].lower() == "none":
- opts.beparams[param] = constants.VALUE_NONE
- elif param == constants.BE_MEMORY:
- opts.beparams[constants.BE_MEMORY] = \
- utils.ParseUnit(opts.beparams[constants.BE_MEMORY])
+ if isinstance(opts.beparams[param], basestring):
+ if opts.beparams[param].lower() == "default":
+ opts.beparams[param] = constants.VALUE_DEFAULT
+
+ utils.ForceDictType(opts.beparams, constants.BES_PARAMETER_TYPES,
+ allowed_values=[constants.VALUE_DEFAULT])
for param in opts.hypervisor:
- if opts.hypervisor[param].lower() == "default":
- opts.hypervisor[param] = constants.VALUE_DEFAULT
- elif opts.hypervisor[param].lower() == "none":
- opts.hypervisor[param] = constants.VALUE_NONE
+ if isinstance(opts.hypervisor[param], basestring):
+ if opts.hypervisor[param].lower() == "default":
+ opts.hypervisor[param] = constants.VALUE_DEFAULT
+
+ utils.ForceDictType(opts.hypervisor, constants.HVS_PARAMETER_TYPES,
+ allowed_values=[constants.VALUE_DEFAULT])
for idx, (nic_op, nic_dict) in enumerate(opts.nics):
try:
make_option("-t", "--disk-template", dest="disk_template",
help="Custom disk setup (diskless, file, plain or drbd)",
default=None, metavar="TEMPL"),
+ 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="<size>"),
ikv_option("--disk", help="Disk information",
default=[], dest="disks",
action="append",
metavar="<DIR>"),
make_option("--file-driver", dest="file_driver", help="Driver to use"
" for image files", default="loop", metavar="<DRIVER>"),
- make_option("--iallocator", metavar="<NAME>",
+ make_option("-I", "--iallocator", metavar="<NAME>",
help="Select nodes for the instance automatically using the"
" <NAME> iallocator plugin", default=None, type="string"),
ikv_option("-H", "--hypervisor", dest="hypervisor",
"[-f] <instance>",
"Stops the instance and starts it on the backup node, using"
" the remote mirror (only for instances of type drbd)"),
+ 'migrate': (MigrateInstance, ARGS_ONE,
+ [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"),
+ ],
+ "[-f] <instance>",
+ "Migrate instance to its secondary node"
+ " (only for instances of type drbd)"),
'info': (ShowInstanceConfig, ARGS_ANY,
[DEBUG_OPT,
make_option("-s", "--static", dest="static",
action="store_true", default=False,
help="Only show configuration data, not runtime data"),
- ], "[-s] [<instance>...]",
+ 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."),
+ ], "[-s] {--all | <instance>...}",
"Show information on the specified instance(s)"),
- 'list': (ListInstances, ARGS_NONE,
- [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT], "",
+ 'list': (ListInstances, ARGS_ANY,
+ [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, SYNC_OPT],
+ "[<instance>...]",
"Lists the instances and their status. The available fields are"
" (see the man page for details): status, oper_state, oper_ram,"
" name, os, pnode, snodes, admin_state, admin_ram, disk_template,"
" The default field"
" list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS),
),
- 'reinstall': (ReinstallInstance, ARGS_ONE,
+ 'reinstall': (ReinstallInstance, ARGS_ANY,
[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"
[DEBUG_OPT,
make_option("-n", "--new-secondary", dest="new_secondary",
help=("New secondary node (for secondary"
- " node change)"), metavar="NODE"),
+ " 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"
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"
- " to replace (e.g. sda) (optional,"
- " defaults to all disks")),
- make_option("--iallocator", metavar="<NAME>",
+ help="Comma-separated list of disks"
+ " indices to replace (e.g. 0,2) (optional,"
+ " defaults to all disks)"),
+ make_option("-I", "--iallocator", metavar="<NAME>",
help="Select new secondary for the instance"
" automatically using the"
" <NAME> iallocator plugin (enables"
default=None, type="string"),
SUBMIT_OPT,
],
- "[-s|-p|-n NODE] <instance>",
+ "[-s|-p|-n NODE|-I NAME] <instance>",
"Replaces all disks for the instance"),
'modify': (SetInstanceParams, ARGS_ONE,
[DEBUG_OPT, FORCE_OPT,
"<instance>", "Stops an instance"),
'startup': (StartupInstance, ARGS_ANY,
[DEBUG_OPT, FORCE_OPT, m_force_multi,
- make_option("-e", "--extra", dest="extra_args",
- help="Extra arguments for the instance's kernel",
- default=None, type="string", metavar="<PARAMS>"),
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"),
],
- "<instance>", "Starts an instance"),
+ "<instance>", "Starts an instance"),
'reboot': (RebootInstance, ARGS_ANY,
[DEBUG_OPT, m_force_multi,
- make_option("-e", "--extra", dest="extra_args",
- help="Extra arguments for the instance's kernel",
- default=None, type="string", metavar="<PARAMS>"),
make_option("-t", "--type", dest="reboot_type",
help="Type of reboot: soft/hard/full",
default=constants.INSTANCE_REBOOT_HARD,