raise ec(*args) # pylint: disable=W0142
-def _SsconfResolver(node_list, _,
+def _SsconfResolver(ssconf_ips, node_list, _,
ssc=ssconf.SimpleStore,
nslookup_fn=netutils.Hostname.GetIP):
"""Return addresses for given node names.
+ @type ssconf_ips: bool
+ @param ssconf_ips: Use the ssconf IPs
@type node_list: list
@param node_list: List of node names
@type ssc: class
"""
ss = ssc()
- iplist = ss.GetNodePrimaryIPList()
family = ss.GetPrimaryIPFamily()
- ipmap = dict(entry.split() for entry in iplist)
+
+ if ssconf_ips:
+ iplist = ss.GetNodePrimaryIPList()
+ ipmap = dict(entry.split() for entry in iplist)
+ else:
+ ipmap = {}
result = []
for node in node_list:
else:
requests[name] = \
http.client.HttpClientRequest(str(ip), port,
- http.HTTP_PUT, str("/%s" % procedure),
+ http.HTTP_POST, str("/%s" % procedure),
headers=_RPC_CLIENT_HEADERS,
post_data=body[name],
read_timeout=read_timeout,
return [(d.ToDict(), uid) for d, uid in value]
+def _AnnotateDParamsDRBD(disk, (drbd_params, data_params, meta_params)):
+ """Annotates just DRBD disks layouts.
+
+ """
+ assert disk.dev_type == constants.LD_DRBD8
+
+ disk.params = objects.FillDict(drbd_params, disk.params)
+ (dev_data, dev_meta) = disk.children
+ dev_data.params = objects.FillDict(data_params, dev_data.params)
+ dev_meta.params = objects.FillDict(meta_params, dev_meta.params)
+
+ return disk
+
+
+def _AnnotateDParamsGeneric(disk, (params, )):
+ """Generic disk parameter annotation routine.
+
+ """
+ assert disk.dev_type != constants.LD_DRBD8
+
+ disk.params = objects.FillDict(params, disk.params)
+
+ return disk
+
+
+def AnnotateDiskParams(template, disks, disk_params):
+ """Annotates the disk objects with the disk parameters.
+
+ @param template: The disk template used
+ @param disks: The list of disks objects to annotate
+ @param disk_params: The disk paramaters for annotation
+ @returns: A list of disk objects annotated
+
+ """
+ ld_params = objects.Disk.ComputeLDParams(template, disk_params)
+
+ if template == constants.DT_DRBD8:
+ annotation_fn = _AnnotateDParamsDRBD
+ elif template == constants.DT_DISKLESS:
+ annotation_fn = lambda disk, _: disk
+ else:
+ annotation_fn = _AnnotateDParamsGeneric
+
+ new_disks = []
+ for disk in disks:
+ new_disks.append(annotation_fn(disk.Copy(), ld_params))
+
+ return new_disks
+
+
#: Generic encoders
_ENCODERS = {
rpc_defs.ED_OBJECT_DICT: _ObjectToDict,
class RpcRunner(_RpcClientBase,
_generated_rpc.RpcClientDefault,
_generated_rpc.RpcClientBootstrap,
+ _generated_rpc.RpcClientDnsOnly,
_generated_rpc.RpcClientConfig):
"""RPC runner class.
encoders.update({
# Encoders requiring configuration object
rpc_defs.ED_INST_DICT: self._InstDict,
- rpc_defs.ED_INST_DICT_HVP_BEP: self._InstDictHvpBep,
- rpc_defs.ED_INST_DICT_OSP: self._InstDictOsp,
+ rpc_defs.ED_INST_DICT_HVP_BEP_DP: self._InstDictHvpBepDp,
+ rpc_defs.ED_INST_DICT_OSP_DP: self._InstDictOspDp,
+
+ # Encoders annotating disk parameters
+ rpc_defs.ED_DISKS_DICT_DP: self._DisksDictDP,
+ rpc_defs.ED_SINGLE_DISK_DICT_DP: self._SingleDiskDictDP,
# Encoders with special requirements
rpc_defs.ED_FILE_DETAILS: compat.partial(_PrepareFileUpload, _getents),
_req_process_fn=_req_process_fn)
_generated_rpc.RpcClientConfig.__init__(self)
_generated_rpc.RpcClientBootstrap.__init__(self)
+ _generated_rpc.RpcClientDnsOnly.__init__(self)
_generated_rpc.RpcClientDefault.__init__(self)
def _InstDict(self, instance, hvp=None, bep=None, osp=None):
if osp is not None:
idict["osparams"].update(osp)
for nic in idict["nics"]:
- nic['nicparams'] = objects.FillDict(
+ nic["nicparams"] = objects.FillDict(
cluster.nicparams[constants.PP_DEFAULT],
- nic['nicparams'])
+ nic["nicparams"])
+ idict["disks"] = self._DisksDictDP((instance.disks, instance))
return idict
- def _InstDictHvpBep(self, (instance, hvp, bep)):
+ def _InstDictHvpBepDp(self, (instance, hvp, bep)):
"""Wrapper for L{_InstDict}.
"""
return self._InstDict(instance, hvp=hvp, bep=bep)
- def _InstDictOsp(self, (instance, osparams)):
+ def _InstDictOspDp(self, (instance, osparams)):
"""Wrapper for L{_InstDict}.
"""
return self._InstDict(instance, osp=osparams)
+ def _DisksDictDP(self, (disks, instance)):
+ """Wrapper for L{AnnotateDiskParams}.
+
+ """
+ diskparams = self._cfg.GetInstanceDiskParams(instance)
+ return [disk.ToDict()
+ for disk in AnnotateDiskParams(instance.disk_template,
+ disks, diskparams)]
+
+ def _SingleDiskDictDP(self, (disk, instance)):
+ """Wrapper for L{AnnotateDiskParams}.
+
+ """
+ (anno_disk,) = self._DisksDictDP(([disk], instance))
+ return anno_disk
+
class JobQueueRunner(_RpcClientBase, _generated_rpc.RpcClientJobQueue):
"""RPC wrappers for job queue.
"""
if address_list is None:
- resolver = _SsconfResolver
+ resolver = compat.partial(_SsconfResolver, True)
else:
# Caller provided an address list
resolver = _StaticResolver(address_list)
_generated_rpc.RpcClientJobQueue.__init__(self)
-class BootstrapRunner(_RpcClientBase, _generated_rpc.RpcClientBootstrap):
+class BootstrapRunner(_RpcClientBase,
+ _generated_rpc.RpcClientBootstrap,
+ _generated_rpc.RpcClientDnsOnly):
"""RPC wrappers for bootstrapping.
"""
"""Initializes this class.
"""
- _RpcClientBase.__init__(self, _SsconfResolver, _ENCODERS.get)
+ # Pylint doesn't recognize multiple inheritance properly, see
+ # <http://www.logilab.org/ticket/36586> and
+ # <http://www.logilab.org/ticket/35642>
+ # pylint: disable=W0233
+ _RpcClientBase.__init__(self, compat.partial(_SsconfResolver, True),
+ _ENCODERS.get)
_generated_rpc.RpcClientBootstrap.__init__(self)
+ _generated_rpc.RpcClientDnsOnly.__init__(self)
+
+
+class DnsOnlyRunner(_RpcClientBase, _generated_rpc.RpcClientDnsOnly):
+ """RPC wrappers for calls using only DNS.
+
+ """
+ def __init__(self):
+ """Initialize this class.
+
+ """
+ _RpcClientBase.__init__(self, compat.partial(_SsconfResolver, False),
+ _ENCODERS.get)
+ _generated_rpc.RpcClientDnsOnly.__init__(self)
class ConfigRunner(_RpcClientBase, _generated_rpc.RpcClientConfig):
"""RPC wrappers for L{config}.
"""
- def __init__(self, context, address_list):
+ def __init__(self, context, address_list, _req_process_fn=None,
+ _getents=None):
"""Initializes this class.
"""
lock_monitor_cb = None
if address_list is None:
- resolver = _SsconfResolver
+ resolver = compat.partial(_SsconfResolver, True)
else:
# Caller provided an address list
resolver = _StaticResolver(address_list)
- _RpcClientBase.__init__(self, resolver, _ENCODERS.get,
- lock_monitor_cb=lock_monitor_cb)
+ encoders = _ENCODERS.copy()
+
+ encoders.update({
+ rpc_defs.ED_FILE_DETAILS: compat.partial(_PrepareFileUpload, _getents),
+ })
+
+ _RpcClientBase.__init__(self, resolver, encoders.get,
+ lock_monitor_cb=lock_monitor_cb,
+ _req_process_fn=_req_process_fn)
_generated_rpc.RpcClientConfig.__init__(self)
projects / ganeti-local / blobdiff