if not names:
raise errors.OpPrereqError("No node names passed")
ndata = client.QueryNodes(names, ["name", "pinst_list", "sinst_list"],
- True)
+ False)
ipri = [row[1] for row in ndata]
pri_names = list(itertools.chain(*ipri))
isec = [row[2] for row in ndata]
return choice
-def _TransformPath(user_input):
- """Transform a user path into a canonical value.
-
- This function transforms the a path passed as textual information
- into the constants that the LU code expects.
-
- """
- 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
-
- return result_path
-
-
def _EnsureInstancesExist(client, names):
"""Check for and ensure the given instance names exist.
"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",
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,
"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
# Iterate over the instances and do:
# * Populate the specs with default value
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']:
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,
disks=disks,
disk_template=specs['template'],
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':
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)
+ 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
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"]))
@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])
if isinstance(opts.beparams[param], basestring):
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])
+
+ utils.ForceDictType(opts.beparams, constants.BES_PARAMETER_TYPES,
+ allowed_values=[constants.VALUE_DEFAULT])
for param in opts.hypervisor:
if isinstance(opts.hypervisor[param], basestring):
if opts.hypervisor[param].lower() == "default":
opts.hypervisor[param] = constants.VALUE_DEFAULT
- elif opts.hypervisor[param].lower() == "none":
- opts.hypervisor[param] = constants.VALUE_NONE
+
+ 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",
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_ANY,
[DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, SYNC_OPT],
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("-i", "--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,