X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/4a96f1d1d2dfd8336e28654737e9f99bec3e8e01..0538c375e584b78f85bb29eaa2d3a01e48d9d021:/lib/opcodes.py diff --git a/lib/opcodes.py b/lib/opcodes.py index 06ce78d..6bf14d5 100644 --- a/lib/opcodes.py +++ b/lib/opcodes.py @@ -1,7 +1,7 @@ # # -# Copyright (C) 2006, 2007 Google Inc. +# Copyright (C) 2006, 2007, 2008, 2009, 2010 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 @@ -115,12 +115,16 @@ class OpCode(BaseOpCode): @cvar OP_ID: The ID of this opcode. This should be unique amongst all children of this class. + @cvar OP_DSC_FIELD: The name of a field whose value will be included in the + string returned by Summary(); see the docstring of that + method for details). @ivar dry_run: Whether the LU should be run in dry-run mode, i.e. just the check steps + @ivar priority: Opcode priority for queue """ OP_ID = "OP_ABSTRACT" - __slots__ = ["dry_run", "debug_level"] + __slots__ = ["dry_run", "debug_level", "priority"] def __getstate__(self): """Specialized getstate for opcodes. @@ -169,12 +173,19 @@ class OpCode(BaseOpCode): def Summary(self): """Generates a summary description of this opcode. + The summary is the value of the OP_ID attribute (without the "OP_" prefix), + plus the value of the OP_DSC_FIELD attribute, if one was defined; this field + should allow to easily identify the operation (for an instance creation job, + e.g., it would be the instance name). + """ # all OP_ID start with OP_, we remove that txt = self.OP_ID[3:] field_name = getattr(self, "OP_DSC_FIELD", None) if field_name: field_value = getattr(self, field_name, None) + if isinstance(field_value, (list, tuple)): + field_value = ",".join(str(i) for i in field_value) txt = "%s(%s)" % (txt, field_value) return txt @@ -299,16 +310,25 @@ class OpSetClusterParams(OpCode): OP_ID = "OP_CLUSTER_SET_PARAMS" __slots__ = [ "vg_name", + "drbd_helper", "enabled_hypervisors", "hvparams", "os_hvp", "beparams", + "osparams", "nicparams", + "ndparams", "candidate_pool_size", "maintain_node_health", "uid_pool", "add_uids", "remove_uids", + "default_iallocator", + "reserved_lvs", + "hidden_os", + "blacklisted_os", + "prealloc_wipe_disks", + "master_netdev", ] @@ -319,6 +339,47 @@ class OpRedistributeConfig(OpCode): OP_ID = "OP_CLUSTER_REDIST_CONF" __slots__ = [] + +class OpQuery(OpCode): + """Query for resources/items. + + @ivar what: Resources to query for, must be one of L{constants.QR_OP_QUERY} + @ivar fields: List of fields to retrieve + @ivar filter: Query filter + + """ + OP_ID = "OP_QUERY" + __slots__ = [ + "what", + "fields", + "filter", + ] + + +class OpQueryFields(OpCode): + """Query for available resource/item fields. + + @ivar what: Resources to query for, must be one of L{constants.QR_OP_QUERY} + @ivar fields: List of fields to retrieve + + """ + OP_ID = "OP_QUERY_FIELDS" + __slots__ = [ + "what", + "fields", + ] + + +class OpOutOfBand(OpCode): + """Interact with OOB.""" + OP_ID = "OP_OUT_OF_BAND" + __slots__ = [ + "node_name", + "command", + "timeout", + ] + + # node opcodes class OpRemoveNode(OpCode): @@ -354,11 +415,18 @@ class OpAddNode(OpCode): name is already in the cluster; use this parameter to 'repair' a node that had its configuration broken, or was reinstalled without removal from the cluster. + @type group: C{str} + @ivar group: The node group to which this node will belong. + @type vm_capable: C{bool} + @ivar vm_capable: The vm_capable node attribute + @type master_capable: C{bool} + @ivar master_capable: The master_capable node attribute """ OP_ID = "OP_NODE_ADD" OP_DSC_FIELD = "node_name" - __slots__ = ["node_name", "primary_ip", "secondary_ip", "readd"] + __slots__ = ["node_name", "primary_ip", "secondary_ip", "readd", "group", + "vm_capable", "master_capable", "ndparams"] class OpQueryNodes(OpCode): @@ -418,6 +486,10 @@ class OpSetNodeParams(OpCode): "offline", "drained", "auto_promote", + "master_capable", + "vm_capable", + "secondary_ip", + "ndparams", ] @@ -431,21 +503,13 @@ class OpPowercycleNode(OpCode): ] -class OpEvacuateNode(OpCode): - """Relocate secondary instances from a node.""" - OP_ID = "OP_NODE_EVACUATE" - OP_DSC_FIELD = "node_name" - __slots__ = [ - "node_name", "remote_node", "iallocator", "early_release", - ] - - class OpMigrateNode(OpCode): """Migrate all instances from a node.""" OP_ID = "OP_NODE_MIGRATE" OP_DSC_FIELD = "node_name" __slots__ = [ "node_name", + "mode", "live", ] @@ -460,7 +524,17 @@ class OpNodeEvacuationStrategy(OpCode): # instance opcodes class OpCreateInstance(OpCode): - """Create an instance.""" + """Create an instance. + + @ivar instance_name: Instance name + @ivar mode: Instance creation mode (one of L{constants.INSTANCE_CREATE_MODES}) + @ivar source_handshake: Signed handshake from source (remote import only) + @ivar source_x509_ca: Source X509 CA in PEM format (remote import only) + @ivar source_instance_name: Previous name of instance (remote import only) + @ivar source_shutdown_timeout: Shutdown timeout used for source instance + (remote import only) + + """ OP_ID = "OP_INSTANCE_CREATE" OP_DSC_FIELD = "instance_name" __slots__ = [ @@ -472,8 +546,11 @@ class OpCreateInstance(OpCode): "wait_for_sync", "ip_check", "name_check", "file_storage_dir", "file_driver", "iallocator", - "hypervisor", "hvparams", "beparams", - "dry_run", + "hypervisor", "hvparams", "beparams", "osparams", + "source_handshake", + "source_x509_ca", + "source_instance_name", + "source_shutdown_timeout", ] @@ -481,7 +558,7 @@ class OpReinstallInstance(OpCode): """Reinstall an instance's OS.""" OP_ID = "OP_INSTANCE_REINSTALL" OP_DSC_FIELD = "instance_name" - __slots__ = ["instance_name", "os_type", "force_variant"] + __slots__ = ["instance_name", "os_type", "force_variant", "osparams"] class OpRemoveInstance(OpCode): @@ -499,7 +576,7 @@ class OpRenameInstance(OpCode): """Rename an instance.""" OP_ID = "OP_INSTANCE_RENAME" __slots__ = [ - "instance_name", "ignore_ip", "new_name", + "instance_name", "ip_check", "new_name", "name_check", ] @@ -508,7 +585,7 @@ class OpStartupInstance(OpCode): OP_ID = "OP_INSTANCE_STARTUP" OP_DSC_FIELD = "instance_name" __slots__ = [ - "instance_name", "force", "hvparams", "beparams", + "instance_name", "force", "hvparams", "beparams", "ignore_offline_nodes", ] @@ -516,7 +593,9 @@ class OpShutdownInstance(OpCode): """Shutdown an instance.""" OP_ID = "OP_INSTANCE_SHUTDOWN" OP_DSC_FIELD = "instance_name" - __slots__ = ["instance_name", "timeout"] + __slots__ = [ + "instance_name", "timeout", "ignore_offline_nodes", + ] class OpRebootInstance(OpCode): @@ -554,11 +633,12 @@ class OpMigrateInstance(OpCode): node. @ivar instance_name: the name of the instance + @ivar mode: the migration mode (live, non-live or None for auto) """ OP_ID = "OP_INSTANCE_MIGRATE" OP_DSC_FIELD = "instance_name" - __slots__ = ["instance_name", "live", "cleanup"] + __slots__ = ["instance_name", "mode", "cleanup", "live"] class OpMoveInstance(OpCode): @@ -624,7 +704,7 @@ class OpSetInstanceParams(OpCode): OP_DSC_FIELD = "instance_name" __slots__ = [ "instance_name", - "hvparams", "beparams", "force", + "hvparams", "beparams", "osparams", "force", "nics", "disks", "disk_template", "remote_node", "os_name", "force_variant", ] @@ -639,6 +719,35 @@ class OpGrowDisk(OpCode): ] +# Node group opcodes + +class OpAddGroup(OpCode): + """Add a node group to the cluster.""" + OP_ID = "OP_GROUP_ADD" + OP_DSC_FIELD = "group_name" + __slots__ = ["group_name"] + + +class OpQueryGroups(OpCode): + """Compute the list of node groups.""" + OP_ID = "OP_GROUP_QUERY" + __slots__ = ["output_fields", "names"] + + +class OpRemoveGroup(OpCode): + """Remove a node group from the cluster.""" + OP_ID = "OP_GROUP_REMOVE" + OP_DSC_FIELD = "group_name" + __slots__ = ["group_name"] + + +class OpRenameGroup(OpCode): + """Rename a node group in the cluster.""" + OP_ID = "OP_GROUP_RENAME" + OP_DSC_FIELD = "old_name" + __slots__ = ["old_name", "new_name"] + + # OS opcodes class OpDiagnoseOS(OpCode): """Compute the list of guest operating systems.""" @@ -755,7 +864,7 @@ class OpTestDelay(OpCode): """ OP_ID = "OP_TEST_DELAY" OP_DSC_FIELD = "duration" - __slots__ = ["duration", "on_master", "on_nodes"] + __slots__ = ["duration", "on_master", "on_nodes", "repeat"] class OpTestAllocator(OpCode): @@ -779,6 +888,31 @@ class OpTestAllocator(OpCode): ] +class OpTestJobqueue(OpCode): + """Utility opcode to test some aspects of the job queue. + + """ + OP_ID = "OP_TEST_JQUEUE" + __slots__ = [ + "notify_waitlock", + "notify_exec", + "log_messages", + "fail", + ] + + +class OpTestDummy(OpCode): + """Utility opcode used by unittests. + + """ + OP_ID = "OP_TEST_DUMMY" + __slots__ = [ + "result", + "messages", + "fail", + ] + + OP_MAPPING = dict([(v.OP_ID, v) for v in globals().values() if (isinstance(v, type) and issubclass(v, OpCode) and hasattr(v, "OP_ID"))])