#: Migration type (live/non-live)
_PMigrationMode = ("mode", None,
- ht.TOr(ht.TNone, ht.TElemOf(constants.HT_MIGRATION_MODES)),
+ ht.TMaybe(ht.TElemOf(constants.HT_MIGRATION_MODES)),
"Migration mode")
#: Obsolete 'live' migration mode (boolean)
_PNodeGroupAllocPolicy = \
("alloc_policy", None,
- ht.TOr(ht.TNone, ht.TElemOf(constants.VALID_ALLOC_POLICIES)),
+ ht.TMaybe(ht.TElemOf(constants.VALID_ALLOC_POLICIES)),
"Instance allocation policy")
_PGroupNodeParams = ("ndparams", None, ht.TMaybeDict,
"List of error codes that should be treated as warnings")
# Disk parameters
-_PDiskParams = ("diskparams", None,
- ht.TOr(
- ht.TDictOf(ht.TElemOf(constants.DISK_TEMPLATES), ht.TDict),
- ht.TNone),
- "Disk templates' parameter defaults")
+_PDiskParams = \
+ ("diskparams", None,
+ ht.TMaybe(ht.TDictOf(ht.TElemOf(constants.DISK_TEMPLATES), ht.TDict)),
+ "Disk templates' parameter defaults")
# Parameters for node resource model
_PHvState = ("hv_state", None, ht.TMaybeDict, "Set hypervisor states")
_PDiskState = ("disk_state", None, ht.TMaybeDict, "Set disk states")
+#: Opportunistic locking
+_POpportunisticLocking = \
+ ("opportunistic_locking", False, ht.TBool,
+ ("Whether to employ opportunistic locking for nodes, meaning nodes"
+ " already locked by another opcode won't be considered for instance"
+ " allocation (only when an iallocator is used)"))
_PIgnoreIpolicy = ("ignore_ipolicy", False, ht.TBool,
"Whether to ignore ipolicy violations")
_PAllowRuntimeChgs = ("allow_runtime_changes", True, ht.TBool,
"Allow runtime changes (eg. memory ballooning)")
+#: IAllocator field builder
+_PIAllocFromDesc = lambda desc: ("iallocator", None, ht.TMaybeString, desc)
+
#: a required network name
_PNetworkName = ("network_name", ht.NoDefault, ht.TNonEmptyString,
"Set network name")
#: Utility function for testing NIC definitions
_TestNicDef = \
ht.Comment("NIC parameters")(ht.TDictOf(ht.TElemOf(constants.INIC_PARAMS),
- ht.TOr(ht.TNone, ht.TNonEmptyString)))
+ ht.TMaybeString))
_TSetParamsResultItemItems = [
ht.Comment("name of changed parameter")(ht.TNonEmptyString),
template_check = ht.TElemOf(constants.DISK_TEMPLATES)
if accept_none:
- template_check = ht.TOr(template_check, ht.TNone)
+ template_check = ht.TMaybe(template_check)
return ht.TAnd(template_check, _CheckFileStorage)
_CheckNetworkType = ht.TElemOf(constants.NETWORK_VALID_TYPES)
-#: Network type parameter
-_PNetworkType = ("network_type", None, ht.TOr(ht.TNone, _CheckNetworkType),
- "Network type")
-
+@ht.WithDesc("IPv4 network")
def _CheckCIDRNetNotation(value):
- """Ensure a given cidr notation type is valid.
+ """Ensure a given CIDR notation type is valid.
"""
try:
return True
+@ht.WithDesc("IPv4 address")
def _CheckCIDRAddrNotation(value):
- """Ensure a given cidr notation type is valid.
+ """Ensure a given CIDR notation type is valid.
"""
try:
return True
+@ht.WithDesc("IPv6 address")
def _CheckCIDR6AddrNotation(value):
- """Ensure a given cidr notation type is valid.
+ """Ensure a given CIDR notation type is valid.
"""
try:
return True
+@ht.WithDesc("IPv6 network")
def _CheckCIDR6NetNotation(value):
- """Ensure a given cidr notation type is valid.
+ """Ensure a given CIDR notation type is valid.
"""
try:
return True
-_TIpAddress = ht.TOr(ht.TNone, ht.TAnd(ht.TString, _CheckCIDRNetNotation))
-_TIpAddress6 = ht.TOr(ht.TNone, ht.TAnd(ht.TString, _CheckCIDR6NetNotation))
+_TIpAddress4 = ht.TAnd(ht.TString, _CheckCIDRAddrNotation)
+_TIpAddress6 = ht.TAnd(ht.TString, _CheckCIDR6AddrNotation)
+_TIpNetwork4 = ht.TAnd(ht.TString, _CheckCIDRNetNotation)
+_TIpNetwork6 = ht.TAnd(ht.TString, _CheckCIDR6NetNotation)
+_TMaybeAddr4List = ht.TMaybe(ht.TListOf(_TIpAddress4))
class _AutoOpParamSlots(objectutils.AutoSlots):
job_id = ht.TJobId
job_dep = \
- ht.TAnd(ht.TIsLength(2),
+ ht.TAnd(ht.TOr(ht.TList, ht.TTuple),
+ ht.TIsLength(2),
ht.TItems([job_id,
ht.TListOf(ht.TElemOf(constants.JOBS_FINALIZED))]))
WITH_LU = True
OP_PARAMS = [
("dry_run", None, ht.TMaybeBool, "Run checks only, don't execute"),
- ("debug_level", None, ht.TOr(ht.TNone, ht.TNonNegativeInt), "Debug level"),
+ ("debug_level", None, ht.TMaybe(ht.TNonNegativeInt), "Debug level"),
("priority", constants.OP_PRIO_DEFAULT,
ht.TElemOf(constants.OP_PRIO_SUBMIT_VALID), "Opcode priority"),
(DEPEND_ATTR, None, _BuildJobDepCheck(True),
OP_PARAMS = [
_PHvState,
_PDiskState,
- ("vg_name", None, ht.TOr(ht.TString, ht.TNone), "Volume group name"),
+ ("vg_name", None, ht.TMaybe(ht.TString), "Volume group name"),
("enabled_hypervisors", None,
- ht.TOr(ht.TAnd(ht.TListOf(ht.TElemOf(constants.HYPER_TYPES)), ht.TTrue),
- ht.TNone),
+ ht.TMaybe(ht.TAnd(ht.TListOf(ht.TElemOf(constants.HYPER_TYPES)),
+ ht.TTrue)),
"List of enabled hypervisors"),
- ("hvparams", None, ht.TOr(ht.TDictOf(ht.TNonEmptyString, ht.TDict),
- ht.TNone),
+ ("hvparams", None,
+ ht.TMaybe(ht.TDictOf(ht.TNonEmptyString, ht.TDict)),
"Cluster-wide hypervisor parameter defaults, hypervisor-dependent"),
- ("beparams", None, ht.TOr(ht.TDict, ht.TNone),
+ ("beparams", None, ht.TMaybeDict,
"Cluster-wide backend parameter defaults"),
- ("os_hvp", None, ht.TOr(ht.TDictOf(ht.TNonEmptyString, ht.TDict),
- ht.TNone),
+ ("os_hvp", None, ht.TMaybe(ht.TDictOf(ht.TNonEmptyString, ht.TDict)),
"Cluster-wide per-OS hypervisor parameter defaults"),
- ("osparams", None, ht.TOr(ht.TDictOf(ht.TNonEmptyString, ht.TDict),
- ht.TNone),
+ ("osparams", None,
+ ht.TMaybe(ht.TDictOf(ht.TNonEmptyString, ht.TDict)),
"Cluster-wide OS parameter defaults"),
_PDiskParams,
- ("candidate_pool_size", None, ht.TOr(ht.TPositiveInt, ht.TNone),
+ ("candidate_pool_size", None, ht.TMaybe(ht.TPositiveInt),
"Master candidate pool size"),
("uid_pool", None, ht.NoType,
"Set UID pool, must be list of lists describing UID ranges (two items,"
("ndparams", None, ht.TMaybeDict, "Cluster-wide node parameter defaults"),
("ipolicy", None, ht.TMaybeDict,
"Cluster-wide :ref:`instance policy <rapi-ipolicy>` specs"),
- ("drbd_helper", None, ht.TOr(ht.TString, ht.TNone), "DRBD helper program"),
- ("default_iallocator", None, ht.TOr(ht.TString, ht.TNone),
+ ("drbd_helper", None, ht.TMaybe(ht.TString), "DRBD helper program"),
+ ("default_iallocator", None, ht.TMaybe(ht.TString),
"Default iallocator for cluster"),
- ("master_netdev", None, ht.TOr(ht.TString, ht.TNone),
+ ("master_netdev", None, ht.TMaybe(ht.TString),
"Master network device"),
- ("master_netmask", None, ht.TOr(ht.TInt, ht.TNone),
+ ("master_netmask", None, ht.TMaybe(ht.TNonNegativeInt),
"Netmask of the master IP"),
("reserved_lvs", None, ht.TMaybeListOf(ht.TNonEmptyString),
"List of reserved LVs"),
_PUseLocking,
("fields", ht.NoDefault, ht.TListOf(ht.TNonEmptyString),
"Requested fields"),
- ("qfilter", None, ht.TOr(ht.TNone, ht.TList),
+ ("qfilter", None, ht.TMaybe(ht.TList),
"Query filter"),
]
OP_RESULT = \
_PMigrationTargetNode,
_PAllowRuntimeChgs,
_PIgnoreIpolicy,
- ("iallocator", None, ht.TMaybeString,
- "Iallocator for deciding the target node for shared-storage instances"),
+ _PIAllocFromDesc("Iallocator for deciding the target node"
+ " for shared-storage instances"),
]
OP_RESULT = TJobIdListOnly
_PEarlyRelease,
_PNodeName,
("remote_node", None, ht.TMaybeString, "New secondary node"),
- ("iallocator", None, ht.TMaybeString, "Iallocator for computing solution"),
+ _PIAllocFromDesc("Iallocator for computing solution"),
("mode", ht.NoDefault, ht.TElemOf(constants.NODE_EVAC_MODES),
"Node evacuation mode"),
]
_PWaitForSync,
_PNameCheck,
_PIgnoreIpolicy,
+ _POpportunisticLocking,
("beparams", ht.EmptyDict, ht.TDict, "Backend parameters for instance"),
("disks", ht.NoDefault, ht.TListOf(_TDiskParams),
"Disk descriptions, for example ``[{\"%s\": 100}, {\"%s\": 5}]``;"
" or ".join("``%s``" % i for i in sorted(constants.DISK_ACCESS_SET)))),
("disk_template", ht.NoDefault, _BuildDiskTemplateCheck(True),
"Disk template"),
- ("file_driver", None, ht.TOr(ht.TNone, ht.TElemOf(constants.FILE_DRIVER)),
+ ("file_driver", None, ht.TMaybe(ht.TElemOf(constants.FILE_DRIVER)),
"Driver for file-backed disks"),
("file_storage_dir", None, ht.TMaybeString,
"Directory for storing file-backed disks"),
("hvparams", ht.EmptyDict, ht.TDict,
"Hypervisor parameters for instance, hypervisor-dependent"),
("hypervisor", None, ht.TMaybeString, "Hypervisor"),
- ("iallocator", None, ht.TMaybeString,
- "Iallocator for deciding which node(s) to use"),
+ _PIAllocFromDesc("Iallocator for deciding which node(s) to use"),
("identify_defaults", False, ht.TBool,
"Reset instance parameters to default if equal"),
("ip_check", True, ht.TBool, _PIpCheckDoc),
("os_type", None, ht.TMaybeString, "Operating system"),
("pnode", None, ht.TMaybeString, "Primary node"),
("snode", None, ht.TMaybeString, "Secondary node"),
- ("source_handshake", None, ht.TOr(ht.TList, ht.TNone),
+ ("source_handshake", None, ht.TMaybe(ht.TList),
"Signed handshake from source (remote import only)"),
("source_instance_name", None, ht.TMaybeString,
"Source instance name (remote import only)"),
"""
OP_PARAMS = [
- ("iallocator", None, ht.TMaybeString,
- "Iallocator used to allocate all the instances"),
- ("instances", [], ht.TListOf(ht.TInstanceOf(OpInstanceCreate)),
+ _POpportunisticLocking,
+ _PIAllocFromDesc("Iallocator used to allocate all the instances"),
+ ("instances", ht.EmptyList, ht.TListOf(ht.TInstanceOf(OpInstanceCreate)),
"List of instance create opcodes describing the instances to allocate"),
]
_JOB_LIST = ht.Comment("List of submitted jobs")(TJobIdList)
type(state))
if "instances" in state:
- insts = [OpCode.LoadOpCode(inst) for inst in state["instances"]]
- state["instances"] = insts
+ state["instances"] = map(OpCode.LoadOpCode, state["instances"])
+
return OpCode.__setstate__(self, state)
def Validate(self, set_defaults):
("disks", ht.EmptyList, ht.TListOf(ht.TNonNegativeInt),
"Disk indexes"),
("remote_node", None, ht.TMaybeString, "New secondary node"),
- ("iallocator", None, ht.TMaybeString,
- "Iallocator for deciding new secondary node"),
+ _PIAllocFromDesc("Iallocator for deciding new secondary node"),
]
OP_RESULT = ht.TNone
_PIgnoreConsistency,
_PMigrationTargetNode,
_PIgnoreIpolicy,
- ("iallocator", None, ht.TMaybeString,
- "Iallocator for deciding the target node for shared-storage instances"),
+ _PIAllocFromDesc("Iallocator for deciding the target node for"
+ " shared-storage instances"),
]
OP_RESULT = ht.TNone
_PIgnoreIpolicy,
("cleanup", False, ht.TBool,
"Whether a previously failed migration should be cleaned up"),
- ("iallocator", None, ht.TMaybeString,
- "Iallocator for deciding the target node for shared-storage instances"),
+ _PIAllocFromDesc("Iallocator for deciding the target node for"
+ " shared-storage instances"),
("allow_failover", False, ht.TBool,
"Whether we can fallback to failover if migration is not possible"),
]
" index and a possibly empty dictionary with disk parameter changes"),
("nodes", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
"New instance nodes, if relocation is desired"),
- ("iallocator", None, ht.TMaybeString,
- "Iallocator for deciding new nodes"),
+ _PIAllocFromDesc("Iallocator for deciding new nodes"),
]
OP_RESULT = ht.TNone
("runtime_mem", None, ht.TMaybePositiveInt, "New runtime memory"),
("hvparams", ht.EmptyDict, ht.TDict,
"Per-instance hypervisor parameters, hypervisor-dependent"),
- ("disk_template", None, ht.TOr(ht.TNone, _BuildDiskTemplateCheck(False)),
+ ("disk_template", None, ht.TMaybe(_BuildDiskTemplateCheck(False)),
"Disk template for instance"),
("remote_node", None, ht.TMaybeString,
"Secondary node (used when changing disk template)"),
OP_PARAMS = [
_PInstanceName,
_PEarlyRelease,
- ("iallocator", None, ht.TMaybeString, "Iallocator for computing solution"),
+ _PIAllocFromDesc("Iallocator for computing solution"),
("target_groups", None, ht.TMaybeListOf(ht.TNonEmptyString),
"Destination group names or UUIDs (defaults to \"all but current group\""),
]
OP_PARAMS = [
_PGroupName,
_PEarlyRelease,
- ("iallocator", None, ht.TMaybeString, "Iallocator for computing solution"),
+ _PIAllocFromDesc("Iallocator for computing solution"),
("target_groups", None, ht.TMaybeListOf(ht.TNonEmptyString),
"Destination group names or UUIDs"),
]
("mode", ht.NoDefault, ht.TElemOf(constants.EXPORT_MODES),
"Export mode"),
]
- OP_RESULT = ht.TOr(ht.TNone, ht.TDict)
+ OP_RESULT = ht.TMaybeDict
class OpBackupExport(OpCode):
"""Export an instance.
- For local exports, the export destination is the node name. For remote
- exports, the export destination is a list of tuples, each consisting of
- hostname/IP address, port, HMAC and HMAC salt. The HMAC is calculated using
- the cluster domain secret over the value "${index}:${hostname}:${port}". The
- destination X509 CA must be a signed certificate.
+ For local exports, the export destination is the node name. For
+ remote exports, the export destination is a list of tuples, each
+ consisting of hostname/IP address, port, magic, HMAC and HMAC
+ salt. The HMAC is calculated using the cluster domain secret over
+ the value "${index}:${hostname}:${port}". The destination X509 CA
+ must be a signed certificate.
@ivar mode: Export mode (one of L{constants.EXPORT_MODES})
@ivar target_node: Export destination
"Whether to ignore failures while removing instances"),
("mode", constants.EXPORT_MODE_LOCAL, ht.TElemOf(constants.EXPORT_MODES),
"Export mode"),
- ("x509_key_name", None, ht.TOr(ht.TList, ht.TNone),
+ ("x509_key_name", None, ht.TMaybe(ht.TList),
"Name of X509 key (remote export only)"),
("destination_x509_ca", None, ht.TMaybeString,
"Destination X509 CA (remote export only)"),
return the allocator output (direction 'out')
"""
- OP_DSC_FIELD = "allocator"
+ OP_DSC_FIELD = "iallocator"
OP_PARAMS = [
("direction", ht.NoDefault,
ht.TElemOf(constants.VALID_IALLOCATOR_DIRECTIONS), None),
ht.TMaybeListOf(ht.TDictOf(ht.TElemOf([constants.INIC_MAC,
constants.INIC_IP,
"bridge"]),
- ht.TOr(ht.TNone, ht.TNonEmptyString))),
+ ht.TMaybeString)),
None),
- ("disks", ht.NoDefault, ht.TOr(ht.TNone, ht.TList), None),
+ ("disks", ht.NoDefault, ht.TMaybe(ht.TList), None),
("hypervisor", None, ht.TMaybeString, None),
- ("allocator", None, ht.TMaybeString, None),
+ _PIAllocFromDesc(None),
("tags", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), None),
- ("memory", None, ht.TOr(ht.TNone, ht.TNonNegativeInt), None),
- ("vcpus", None, ht.TOr(ht.TNone, ht.TNonNegativeInt), None),
+ ("memory", None, ht.TMaybe(ht.TNonNegativeInt), None),
+ ("vcpus", None, ht.TMaybe(ht.TNonNegativeInt), None),
("os", None, ht.TMaybeString, None),
("disk_template", None, ht.TMaybeString, None),
("instances", None, ht.TMaybeListOf(ht.TNonEmptyString), None),
("evac_mode", None,
- ht.TOr(ht.TNone, ht.TElemOf(constants.IALLOCATOR_NEVAC_MODES)), None),
+ ht.TMaybe(ht.TElemOf(constants.IALLOCATOR_NEVAC_MODES)), None),
("target_groups", None, ht.TMaybeListOf(ht.TNonEmptyString), None),
("spindle_use", 1, ht.TNonNegativeInt, None),
("count", 1, ht.TNonNegativeInt, None),
OP_DSC_FIELD = "network_name"
OP_PARAMS = [
_PNetworkName,
- _PNetworkType,
- ("network", None, _TIpAddress, "IPv4 subnet"),
- ("gateway", None, _TIpAddress, "IPv4 gateway"),
- ("network6", None, _TIpAddress6, "IPv6 subnet"),
- ("gateway6", None, _TIpAddress6, "IPv6 gateway"),
+ ("network_type", None, ht.TMaybe(_CheckNetworkType), "Network type"),
+ ("network", ht.NoDefault, _TIpNetwork4, "IPv4 subnet"),
+ ("gateway", None, ht.TMaybe(_TIpAddress4), "IPv4 gateway"),
+ ("network6", None, ht.TMaybe(_TIpNetwork6), "IPv6 subnet"),
+ ("gateway6", None, ht.TMaybe(_TIpAddress6), "IPv6 gateway"),
("mac_prefix", None, ht.TMaybeString,
"MAC address prefix that overrides cluster one"),
- ("add_reserved_ips", None,
- ht.TOr(ht.TNone, ht.TListOf(_CheckCIDRAddrNotation)),
+ ("add_reserved_ips", None, _TMaybeAddr4List,
"Which IP addresses to reserve"),
+ ("conflicts_check", True, ht.TBool,
+ "Whether to check for conflicting IP addresses"),
("tags", ht.EmptyList, ht.TListOf(ht.TNonEmptyString), "Network tags"),
]
OP_RESULT = ht.TNone
OP_DSC_FIELD = "network_name"
OP_PARAMS = [
_PNetworkName,
- _PNetworkType,
- ("gateway", None, _TIpAddress, "IPv4 gateway"),
- ("network6", None, _TIpAddress6, "IPv6 subnet"),
- ("gateway6", None, _TIpAddress6, "IPv6 gateway"),
- ("mac_prefix", None, ht.TMaybeString,
+ ("network_type", None, ht.TMaybeValueNone(_CheckNetworkType),
+ "Network type"),
+ ("gateway", None, ht.TMaybeValueNone(_TIpAddress4), "IPv4 gateway"),
+ ("network6", None, ht.TMaybeValueNone(_TIpNetwork6), "IPv6 subnet"),
+ ("gateway6", None, ht.TMaybeValueNone(_TIpAddress6), "IPv6 gateway"),
+ ("mac_prefix", None, ht.TMaybeValueNone(ht.TString),
"MAC address prefix that overrides cluster one"),
- ("add_reserved_ips", None,
- ht.TOr(ht.TNone, ht.TListOf(_CheckCIDRAddrNotation)),
+ ("add_reserved_ips", None, _TMaybeAddr4List,
"Which external IP addresses to reserve"),
- ("remove_reserved_ips", None,
- ht.TOr(ht.TNone, ht.TListOf(_CheckCIDRAddrNotation)),
+ ("remove_reserved_ips", None, _TMaybeAddr4List,
"Which external IP addresses to release"),
]
OP_RESULT = ht.TNone
OP_PARAMS = [
_PGroupName,
_PNetworkName,
- ("network_mode", None, ht.TMaybeString, "Connectivity mode"),
- ("network_link", None, ht.TMaybeString, "Connectivity link"),
+ ("network_mode", ht.NoDefault, ht.TString, "Connectivity mode"),
+ ("network_link", ht.NoDefault, ht.TString, "Connectivity link"),
("conflicts_check", True, ht.TBool, "Whether to check for conflicting IPs"),
]
OP_RESULT = ht.TNone
("names", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
"Empty list to query all groups, group names otherwise"),
]
- OP_RESULT = ht.TNone
+ OP_RESULT = _TOldQueryResult
def _GetOpList():
projects / ganeti-local / blobdiff