#
#
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2011 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
"""Node group related commands"""
-# pylint: disable-msg=W0401,W0614
+# pylint: disable=W0401,W0614
# W0401: Wildcard import ganeti.cli
# W0614: Unused import %s from wildcard import (since we need cli)
from ganeti.cli import *
from ganeti import constants
+from ganeti import objects
from ganeti import opcodes
from ganeti import utils
#: default list of fields for L{ListGroups}
-_LIST_DEF_FIELDS = ["name", "node_cnt", "pinst_cnt", "alloc_policy"]
+_LIST_DEF_FIELDS = ["name", "node_cnt", "pinst_cnt", "alloc_policy", "ndparams"]
+
+
+_ENV_OVERRIDE = frozenset(["list"])
def AddGroup(opts, args):
@return: the desired exit code
"""
+ ipolicy = \
+ objects.CreateIPolicyFromOpts(ispecs_mem_size=opts.ispecs_mem_size,
+ ispecs_cpu_count=opts.ispecs_cpu_count,
+ ispecs_disk_count=opts.ispecs_disk_count,
+ ispecs_disk_size=opts.ispecs_disk_size,
+ ispecs_nic_count=opts.ispecs_nic_count,
+ group_ipolicy=True)
+ for key in ipolicy.keys():
+ utils.ForceDictType(ipolicy[key], constants.ISPECS_PARAMETER_TYPES)
+
(group_name,) = args
- op = opcodes.OpAddGroup(group_name=group_name, ndparams=opts.ndparams,
- alloc_policy=opts.alloc_policy)
+ diskparams = dict(opts.diskparams)
+
+ if opts.disk_state:
+ disk_state = utils.FlatToDict(opts.disk_state)
+ else:
+ disk_state = {}
+ hv_state = dict(opts.hv_state)
+
+ op = opcodes.OpGroupAdd(group_name=group_name, ndparams=opts.ndparams,
+ alloc_policy=opts.alloc_policy,
+ diskparams=diskparams, ipolicy=ipolicy,
+ hv_state=hv_state,
+ disk_state=disk_state)
SubmitOpCode(op, opts=opts)
group_name = args[0]
node_names = args[1:]
- op = opcodes.OpAssignGroupNodes(group_name=group_name, nodes=node_names,
+ op = opcodes.OpGroupAssignNodes(group_name=group_name, nodes=node_names,
force=opts.force)
SubmitOpCode(op, opts=opts)
+def _FmtDict(data):
+ """Format dict data into command-line format.
+
+ @param data: The input dict to be formatted
+ @return: The formatted dict
+
+ """
+ if not data:
+ return "(empty)"
+
+ return utils.CommaJoin(["%s=%s" % (key, value)
+ for key, value in data.items()])
+
+
def ListGroups(opts, args):
"""List node groups and their properties.
"""
desired_fields = ParseFields(opts.output, _LIST_DEF_FIELDS)
- fmtoverride = dict.fromkeys(["node_list", "pinst_list"], (",".join, False))
+ fmtoverride = {
+ "node_list": (",".join, False),
+ "pinst_list": (",".join, False),
+ "ndparams": (_FmtDict, False),
+ }
return GenericList(constants.QR_GROUP, desired_fields, args, None,
opts.separator, not opts.no_headers,
- format_override=fmtoverride)
+ format_override=fmtoverride, verbose=opts.verbose,
+ force_filter=opts.force_filter)
def ListGroupFields(opts, args):
def SetGroupParams(opts, args):
"""Modifies a node group's parameters.
- @param opts: the command line options seletect by the user
+ @param opts: the command line options selected by the user
@type args: list
@param args: should contain only one element, the node group name
@return: the desired exit code
"""
- all_changes = {
- "ndparams": opts.ndparams,
- "alloc_policy": opts.alloc_policy,
- }
-
- if all_changes.values().count(None) == len(all_changes):
+ allmods = [opts.ndparams, opts.alloc_policy, opts.diskparams, opts.hv_state,
+ opts.disk_state, opts.ispecs_mem_size, opts.ispecs_cpu_count,
+ opts.ispecs_disk_count, opts.ispecs_disk_size,
+ opts.ispecs_nic_count, opts.diskparams]
+ if allmods.count(None) == len(allmods):
ToStderr("Please give at least one of the parameters.")
return 1
- op = opcodes.OpSetGroupParams(group_name=args[0], # pylint: disable-msg=W0142
- **all_changes)
+ if opts.disk_state:
+ disk_state = utils.FlatToDict(opts.disk_state)
+ else:
+ disk_state = {}
+
+ hv_state = dict(opts.hv_state)
+
+ diskparams = dict(opts.diskparams)
+
+ # set the default values
+ to_ipolicy = [
+ opts.ispecs_mem_size,
+ opts.ispecs_cpu_count,
+ opts.ispecs_disk_count,
+ opts.ispecs_disk_size,
+ opts.ispecs_nic_count,
+ ]
+ for ispec in to_ipolicy:
+ for param in ispec:
+ if isinstance(ispec[param], basestring):
+ if ispec[param].lower() == "default":
+ ispec[param] = constants.VALUE_DEFAULT
+ # create ipolicy object
+ ipolicy = objects.CreateIPolicyFromOpts(\
+ ispecs_mem_size=opts.ispecs_mem_size,
+ ispecs_cpu_count=opts.ispecs_cpu_count,
+ ispecs_disk_count=opts.ispecs_disk_count,
+ ispecs_disk_size=opts.ispecs_disk_size,
+ ispecs_nic_count=opts.ispecs_nic_count,
+ group_ipolicy=True,
+ allowed_values=[constants.VALUE_DEFAULT])
+ for key in ipolicy.keys():
+ utils.ForceDictType(ipolicy[key], constants.ISPECS_PARAMETER_TYPES,
+ allowed_values=[constants.VALUE_DEFAULT])
+
+ op = opcodes.OpGroupSetParams(group_name=args[0],
+ ndparams=opts.ndparams,
+ alloc_policy=opts.alloc_policy,
+ hv_state=hv_state,
+ disk_state=disk_state,
+ diskparams=diskparams,
+ ipolicy=ipolicy)
+
result = SubmitOrSend(op, opts)
if result:
"""
(group_name,) = args
- op = opcodes.OpRemoveGroup(group_name=group_name)
+ op = opcodes.OpGroupRemove(group_name=group_name)
SubmitOpCode(op, opts=opts)
@return: the desired exit code
"""
- old_name, new_name = args
- op = opcodes.OpRenameGroup(old_name=old_name, new_name=new_name)
+ group_name, new_name = args
+ op = opcodes.OpGroupRename(group_name=group_name, new_name=new_name)
SubmitOpCode(op, opts=opts)
+def EvacuateGroup(opts, args):
+ """Evacuate a node group.
+
+ """
+ (group_name, ) = args
+
+ cl = GetClient()
+
+ op = opcodes.OpGroupEvacuate(group_name=group_name,
+ iallocator=opts.iallocator,
+ target_groups=opts.to,
+ early_release=opts.early_release)
+ result = SubmitOpCode(op, cl=cl, opts=opts)
+
+ # Keep track of submitted jobs
+ jex = JobExecutor(cl=cl, opts=opts)
+
+ for (status, job_id) in result[constants.JOB_IDS_KEY]:
+ jex.AddJobId(None, status, job_id)
+
+ results = jex.GetResults()
+ bad_cnt = len([row for row in results if not row[0]])
+ if bad_cnt == 0:
+ ToStdout("All instances evacuated successfully.")
+ rcode = constants.EXIT_SUCCESS
+ else:
+ ToStdout("There were %s errors during the evacuation.", bad_cnt)
+ rcode = constants.EXIT_FAILURE
+
+ return rcode
+
+INSTANCE_POLICY_OPTS = [
+ SPECS_CPU_COUNT_OPT,
+ SPECS_DISK_COUNT_OPT,
+ SPECS_DISK_SIZE_OPT,
+ SPECS_MEM_SIZE_OPT,
+ SPECS_NIC_COUNT_OPT,
+ ]
+
commands = {
"add": (
- AddGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT],
+ AddGroup, ARGS_ONE_GROUP,
+ [DRY_RUN_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT, DISK_PARAMS_OPT,
+ HV_STATE_OPT, DISK_STATE_OPT] + INSTANCE_POLICY_OPTS,
"<group_name>", "Add a new node group to the cluster"),
"assign-nodes": (
AssignNodes, ARGS_ONE_GROUP + ARGS_MANY_NODES, [DRY_RUN_OPT, FORCE_OPT],
"<group_name> <node>...", "Assign nodes to a group"),
"list": (
ListGroups, ARGS_MANY_GROUPS,
- [NOHDR_OPT, SEP_OPT, FIELDS_OPT],
+ [NOHDR_OPT, SEP_OPT, FIELDS_OPT, VERBOSE_OPT, FORCE_FILTER_OPT],
"[<group_name>...]",
"Lists the node groups in the cluster. The available fields can be shown"
" using the \"list-fields\" command (see the man page for details)."
"Lists all available fields for node groups"),
"modify": (
SetGroupParams, ARGS_ONE_GROUP,
- [DRY_RUN_OPT, SUBMIT_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT],
+ [DRY_RUN_OPT, SUBMIT_OPT, ALLOC_POLICY_OPT, NODE_PARAMS_OPT, HV_STATE_OPT,
+ DISK_STATE_OPT, DISK_PARAMS_OPT] + INSTANCE_POLICY_OPTS,
"<group_name>", "Alters the parameters of a node group"),
"remove": (
RemoveGroup, ARGS_ONE_GROUP, [DRY_RUN_OPT],
- "[--dry-run] <group_name>",
+ "[--dry-run] <group-name>",
"Remove an (empty) node group from the cluster"),
"rename": (
RenameGroup, [ArgGroup(min=2, max=2)], [DRY_RUN_OPT],
- "[--dry-run] <old_name> <new_name>", "Rename a node group"),
-}
+ "[--dry-run] <group-name> <new-name>", "Rename a node group"),
+ "evacuate": (
+ EvacuateGroup, [ArgGroup(min=1, max=1)],
+ [TO_GROUP_OPT, IALLOCATOR_OPT, EARLY_RELEASE_OPT],
+ "[-I <iallocator>] [--to <group>]",
+ "Evacuate all instances within a group"),
+ "list-tags": (
+ ListTags, ARGS_ONE_GROUP, [PRIORITY_OPT],
+ "<instance_name>", "List the tags of the given instance"),
+ "add-tags": (
+ AddTags, [ArgGroup(min=1, max=1), ArgUnknown()],
+ [TAG_SRC_OPT, PRIORITY_OPT],
+ "<instance_name> tag...", "Add tags to the given instance"),
+ "remove-tags": (
+ RemoveTags, [ArgGroup(min=1, max=1), ArgUnknown()],
+ [TAG_SRC_OPT, PRIORITY_OPT],
+ "<instance_name> tag...", "Remove tags from given instance"),
+ }
def Main():
- return GenericMain(commands)
+ return GenericMain(commands,
+ override={"tag_type": constants.TAG_NODEGROUP},
+ env_override=_ENV_OVERRIDE)
projects / ganeti-local / blobdiff