X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/3ecf6786a731c0a467f0efcbf6346914e3824ec8..82d9caef3459e6e428b33d444e970b29ccd97cc9:/lib/rpc.py

diff --git a/lib/rpc.py b/lib/rpc.py
index fd1f45f..168f0af 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#
 #
 
 # Copyright (C) 2006, 2007 Google Inc.
@@ -23,53 +23,23 @@
 
 """
 
-# pylint: disable-msg=C0103
+# pylint: disable-msg=C0103,R0201,R0904
+# C0103: Invalid name, since call_ are not valid
+# R0201: Method could be a function, we keep all rpcs instance methods
+# as not to change them back and forth between static/instance methods
+# if they need to start using instance attributes
+# R0904: Too many public methods
 
 import os
+import socket
+import httplib
+import logging
 
-from twisted.internet.pollreactor import PollReactor
-
-class ReReactor(PollReactor):
-  """A re-startable Reactor implementation.
-
-  """
-  def run(self, installSignalHandlers=1):
-    """Custom run method.
-
-    This is customized run that, before calling Reactor.run, will
-    reinstall the shutdown events and re-create the threadpool in case
-    these are not present (as will happen on the second run of the
-    reactor).
-
-    """
-    if not 'shutdown' in self._eventTriggers:
-      # the shutdown queue has been killed, we are most probably
-      # at the second run, thus recreate the queue
-      self.addSystemEventTrigger('during', 'shutdown', self.crash)
-      self.addSystemEventTrigger('during', 'shutdown', self.disconnectAll)
-    if self.threadpool is not None and self.threadpool.joined == 1:
-      # in case the threadpool has been stopped, re-start it
-      # and add a trigger to stop it at reactor shutdown
-      self.threadpool.start()
-      self.addSystemEventTrigger('during', 'shutdown', self.threadpool.stop)
-
-    return PollReactor.run(self, installSignalHandlers)
-
-
-import twisted.internet.main
-twisted.internet.main.installReactor(ReReactor())
-
-from twisted.spread import pb
-from twisted.internet import reactor
-from twisted.cred import credentials
-from OpenSSL import SSL, crypto
+import simplejson
 
-from ganeti import logger
 from ganeti import utils
-from ganeti import errors
-from ganeti import constants
 from ganeti import objects
-from ganeti import ssconf
+
 
 class NodeController:
   """Node-handling class.
@@ -82,112 +52,46 @@ class NodeController:
   def __init__(self, parent, node):
     self.parent = parent
     self.node = node
+    self.failed = False
 
-  def _check_end(self):
-    """Stop the reactor if we got all the results.
-
-    """
-    if len(self.parent.results) == len(self.parent.nc):
-      reactor.stop()
-
-  def cb_call(self, obj):
-    """Callback for successfull connect.
-
-    If the connect and login sequence succeeded, we proceed with
-    making the actual call.
-
-    """
-    deferred = obj.callRemote(self.parent.procedure, self.parent.args)
-    deferred.addCallbacks(self.cb_done, self.cb_err2)
-
-  def cb_done(self, result):
-    """Callback for successful call.
-
-    When we receive the result from a call, we check if it was an
-    error and if so we raise a generic RemoteError (we can't pass yet
-    the actual exception over). If there was no error, we store the
-    result.
-
-    """
-    tb, self.parent.results[self.node] = result
-    self._check_end()
-    if tb:
-      raise errors.RemoteError("Remote procedure error calling %s on %s:"
-                               "\n%s" % (self.parent.procedure,
-                                         self.node,
-                                         tb))
-
-  def cb_err1(self, reason):
-    """Error callback for unsuccessful connect.
-
-    """
-    logger.Error("caller_connect: could not connect to remote host %s,"
-                 " reason %s" % (self.node, reason))
-    self.parent.results[self.node] = False
-    self._check_end()
-
-  def cb_err2(self, reason):
-    """Error callback for unsuccessful call.
-
-    This is when the call didn't return anything, not even an error,
-    or when it time out, etc.
+    self.http_conn = hc = httplib.HTTPConnection(node, self.parent.port)
+    try:
+      hc.connect()
+      hc.putrequest('PUT', "/%s" % self.parent.procedure,
+                    skip_accept_encoding=True)
+      hc.putheader('Content-Length', str(len(parent.body)))
+      hc.endheaders()
+      hc.send(parent.body)
+    except socket.error, err:
+      logging.exception("Error connecting to node %s", node)
+      self.failed = True
+
+  def get_response(self):
+    """Try to process the response from the node.
 
     """
-    logger.Error("caller_call: could not call %s on node %s,"
-                 " reason %s" % (self.parent.procedure, self.node, reason))
-    self.parent.results[self.node] = False
-    self._check_end()
-
-
-class MirrorContextFactory:
-  """Certificate verifier factory.
-
-  This factory creates contexts that verify if the remote end has a
-  specific certificate (i.e. our own certificate).
-
-  The checks we do are that the PEM dump of the certificate is the
-  same as our own and (somewhat redundantly) that the SHA checksum is
-  the same.
-
-  """
-  isClient = 1
-
-  def __init__(self):
+    if self.failed:
+      # we already failed in connect
+      return False
+    resp = self.http_conn.getresponse()
+    if resp.status != 200:
+      return False
     try:
-      fd = open(constants.SSL_CERT_FILE, 'r')
-      try:
-        data = fd.read(16384)
-      finally:
-        fd.close()
-    except EnvironmentError, err:
-      raise errors.ConfigurationError("missing SSL certificate: %s" %
-                                      str(err))
-    self.mycert = crypto.load_certificate(crypto.FILETYPE_PEM, data)
-    self.mypem = crypto.dump_certificate(crypto.FILETYPE_PEM, self.mycert)
-    self.mydigest = self.mycert.digest('SHA')
-
-  def verifier(self, conn, x509, errno, err_depth, retcode):
-    """Certificate verify method.
-
-    """
-    if self.mydigest != x509.digest('SHA'):
+      length = int(resp.getheader('Content-Length', '0'))
+    except ValueError:
       return False
-    if crypto.dump_certificate(crypto.FILETYPE_PEM, x509) != self.mypem:
+    if not length:
+      logging.error("Zero-length reply from node %s", self.node)
       return False
-    return True
-
-  def getContext(self):
-    """Context generator.
+    payload = resp.read(length)
+    unload = simplejson.loads(payload)
+    return unload
 
-    """
-    context = SSL.Context(SSL.TLSv1_METHOD)
-    context.set_verify(SSL.VERIFY_PEER, self.verifier)
-    return context
 
 class Client:
   """RPC Client class.
 
-  This class, given a (remote) ethod name, a list of parameters and a
+  This class, given a (remote) method name, a list of parameters and a
   list of nodes, will contact (in parallel) all nodes, and return a
   dict of results (key: node name, value: result).
 
@@ -201,13 +105,13 @@ class Client:
   allresult = []
 
   def __init__(self, procedure, args):
-    ss = ssconf.SimpleStore()
-    self.port = ss.GetNodeDaemonPort()
-    self.nodepw = ss.GetNodeDaemonPassword()
+    self.port = utils.GetNodeDaemonPort()
+    self.nodepw = utils.GetNodeDaemonPassword()
     self.nc = {}
     self.results = {}
     self.procedure = procedure
     self.args = args
+    self.body = simplejson.dumps(args)
 
   #--- generic connector -------------
 
@@ -222,13 +126,7 @@ class Client:
     """Add a node to the target list.
 
     """
-    factory = pb.PBClientFactory()
     self.nc[connect_node] = nc = NodeController(self, connect_node)
-    reactor.connectSSL(connect_node, self.port, factory,
-                       MirrorContextFactory())
-    #d = factory.getRootObject()
-    d = factory.login(credentials.UsernamePassword("master_node", self.nodepw))
-    d.addCallbacks(nc.cb_call, nc.cb_err1)
 
   def getresult(self):
     """Return the results of the call.
@@ -243,524 +141,801 @@ class Client:
     queued, otherwise it does nothing.
 
     """
-    if self.nc:
-      reactor.run()
+    for node, nc in self.nc.items():
+      self.results[node] = nc.get_response()
 
 
-def call_volume_list(node_list, vg_name):
-  """Gets the logical volumes present in a given volume group.
+class RpcRunner(object):
+  """RPC runner class"""
 
-  This is a multi-node call.
+  def __init__(self, cfg):
+    """Initialized the rpc runner.
 
-  """
-  c = Client("volume_list", [vg_name])
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+    @type cfg:  C{config.ConfigWriter}
+    @param cfg: the configuration object that will be used to get data
+                about the cluster
 
+    """
+    self._cfg = cfg
 
-def call_vg_list(node_list):
-  """Gets the volume group list.
+  def _InstDict(self, instance):
+    """Convert the given instance to a dict.
 
-  This is a multi-node call.
+    This is done via the instance's ToDict() method and additionally
+    we fill the hvparams with the cluster defaults.
 
-  """
-  c = Client("vg_list", [])
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+    @type instance: L{objects.Instance}
+    @param instance: an Instance object
+    @rtype: dict
+    @return: the instance dict, with the hvparams filled with the
+        cluster defaults
 
+    """
+    idict = instance.ToDict()
+    cluster = self._cfg.GetClusterInfo()
+    idict["hvparams"] = cluster.FillHV(instance)
+    idict["beparams"] = cluster.FillBE(instance)
+    return idict
 
-def call_bridges_exist(node, bridges_list):
-  """Checks if a node has all the bridges given.
+  def call_volume_list(self, node_list, vg_name):
+    """Gets the logical volumes present in a given volume group.
 
-  This method checks if all bridges given in the bridges_list are
-  present on the remote node, so that an instance that uses interfaces
-  on those bridges can be started.
+    This is a multi-node call.
 
-  This is a single-node call.
+    """
+    c = Client("volume_list", [vg_name])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-  """
-  c = Client("bridges_exist", [bridges_list])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_vg_list(self, node_list):
+    """Gets the volume group list.
 
+    This is a multi-node call.
 
-def call_instance_start(node, instance, extra_args):
-  """Stars an instance.
+    """
+    c = Client("vg_list", [])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-  This is a single-node call.
+  def call_bridges_exist(self, node, bridges_list):
+    """Checks if a node has all the bridges given.
 
-  """
-  c = Client("instance_start", [instance.Dumps(), extra_args])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    This method checks if all bridges given in the bridges_list are
+    present on the remote node, so that an instance that uses interfaces
+    on those bridges can be started.
 
+    This is a single-node call.
 
-def call_instance_shutdown(node, instance):
-  """Stops an instance.
+    """
+    c = Client("bridges_exist", [bridges_list])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  This is a single-node call.
+  def call_instance_start(self, node, instance, extra_args):
+    """Starts an instance.
 
-  """
-  c = Client("instance_shutdown", [instance.Dumps()])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    This is a single-node call.
 
+    """
+    c = Client("instance_start", [self._InstDict(instance), extra_args])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-def call_instance_os_add(node, inst, osdev, swapdev):
-  """Installs an OS on the given instance.
+  def call_instance_shutdown(self, node, instance):
+    """Stops an instance.
 
-  This is a single-node call.
+    This is a single-node call.
 
-  """
-  params = [inst.Dumps(), osdev, swapdev]
-  c = Client("instance_os_add", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    """
+    c = Client("instance_shutdown", [self._InstDict(instance)])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
+
+  def call_instance_migrate(self, node, instance, target, live):
+    """Migrate an instance.
+
+    This is a single-node call.
+
+    @type node: string
+    @param node: the node on which the instance is currently running
+    @type instance: C{objects.Instance}
+    @param instance: the instance definition
+    @type target: string
+    @param target: the target node name
+    @type live: boolean
+    @param live: whether the migration should be done live or not (the
+        interpretation of this parameter is left to the hypervisor)
 
+    """
+    c = Client("instance_migrate", [self._InstDict(instance), target, live])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-def call_instance_info(node, instance):
-  """Returns information about a single instance.
+  def call_instance_reboot(self, node, instance, reboot_type, extra_args):
+    """Reboots an instance.
 
-  This is a single-node call.
+    This is a single-node call.
 
-  """
-  c = Client("instance_info", [instance])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    """
+    c = Client("instance_reboot", [self._InstDict(instance),
+                                   reboot_type, extra_args])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
+  def call_instance_os_add(self, node, inst):
+    """Installs an OS on the given instance.
 
-def call_all_instances_info(node_list):
-  """Returns information about all instances on a given node.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    params = [self._InstDict(inst)]
+    c = Client("instance_os_add", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  c = Client("all_instances_info", [])
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+  def call_instance_run_rename(self, node, inst, old_name):
+    """Run the OS rename script for an instance.
 
+    This is a single-node call.
 
-def call_instance_list(node_list):
-  """Returns the list of running instances on a given node.
+    """
+    params = [self._InstDict(inst), old_name]
+    c = Client("instance_run_rename", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  This is a single-node call.
+  def call_instance_info(self, node, instance, hname):
+    """Returns information about a single instance.
 
-  """
-  c = Client("instance_list", [])
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+    This is a single-node call.
 
+    @type node_list: list
+    @param node_list: the list of nodes to query
+    @type instance: string
+    @param instance: the instance name
+    @type hname: string
+    @param hname: the hypervisor type of the instance
 
-def call_node_info(node_list, vg_name):
-  """Return node information.
+    """
+    c = Client("instance_info", [instance, hname])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  This will return memory information and volume group size and free
-  space.
+  def call_all_instances_info(self, node_list, hypervisor_list):
+    """Returns information about all instances on the given nodes.
 
-  This is a multi-node call.
+    This is a multi-node call.
 
-  """
-  c = Client("node_info", [vg_name])
-  c.connect_list(node_list)
-  c.run()
-  retux = c.getresult()
+    @type node_list: list
+    @param node_list: the list of nodes to query
+    @type hypervisor_list: list
+    @param hypervisor_list: the hypervisors to query for instances
 
-  for node_name in retux:
-    ret = retux.get(node_name, False)
-    if type(ret) != dict:
-      logger.Error("could not connect to node %s" % (node_name))
-      ret = {}
+    """
+    c = Client("all_instances_info", [hypervisor_list])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-    utils.CheckDict(ret,
-                    { 'memory_total' : '-',
-                      'memory_dom0' : '-',
-                      'memory_free' : '-',
-                      'vg_size' : 'node_unreachable',
-                      'vg_free' : '-' },
-                    "call_node_info",
-                    )
-  return retux
+  def call_instance_list(self, node_list, hypervisor_list):
+    """Returns the list of running instances on a given node.
 
+    This is a multi-node call.
 
-def call_node_add(node, dsa, dsapub, rsa, rsapub, ssh, sshpub):
-  """Add a node to the cluster.
+    @type node_list: list
+    @param node_list: the list of nodes to query
+    @type hypervisor_list: list
+    @param hypervisor_list: the hypervisors to query for instances
 
-  This is a single-node call.
+    """
+    c = Client("instance_list", [hypervisor_list])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-  """
-  params = [dsa, dsapub, rsa, rsapub, ssh, sshpub]
-  c = Client("node_add", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_node_tcp_ping(self, node, source, target, port, timeout,
+                         live_port_needed):
+    """Do a TcpPing on the remote node
 
+    This is a single-node call.
 
-def call_node_verify(node_list, checkdict):
-  """Request verification of given parameters.
+    """
+    c = Client("node_tcp_ping", [source, target, port, timeout,
+                                 live_port_needed])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  This is a multi-node call.
+  def call_node_has_ip_address(self, node, address):
+    """Checks if a node has the given IP address.
 
-  """
-  c = Client("node_verify", [checkdict])
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+    This is a single-node call.
 
+    """
+    c = Client("node_has_ip_address", [address])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-def call_node_start_master(node):
-  """Tells a node to activate itself as a master.
+  def call_node_info(self, node_list, vg_name, hypervisor_type):
+    """Return node information.
 
-  This is a single-node call.
+    This will return memory information and volume group size and free
+    space.
 
-  """
-  c = Client("node_start_master", [])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    This is a multi-node call.
 
+    @type node_list: list
+    @param node_list: the list of nodes to query
+    @type vgname: C{string}
+    @param vgname: the name of the volume group to ask for disk space
+        information
+    @type hypervisor_type: C{str}
+    @param hypervisor_type: the name of the hypervisor to ask for
+        memory information
 
-def call_node_stop_master(node):
-  """Tells a node to demote itself from master status.
+    """
+    c = Client("node_info", [vg_name, hypervisor_type])
+    c.connect_list(node_list)
+    c.run()
+    retux = c.getresult()
+
+    for node_name in retux:
+      ret = retux.get(node_name, False)
+      if type(ret) != dict:
+        logging.error("could not connect to node %s", node_name)
+        ret = {}
+
+      utils.CheckDict(ret,
+                      { 'memory_total' : '-',
+                        'memory_dom0' : '-',
+                        'memory_free' : '-',
+                        'vg_size' : 'node_unreachable',
+                        'vg_free' : '-' },
+                      "call_node_info",
+                      )
+    return retux
+
+  def call_node_add(self, node, dsa, dsapub, rsa, rsapub, ssh, sshpub):
+    """Add a node to the cluster.
+
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    params = [dsa, dsapub, rsa, rsapub, ssh, sshpub]
+    c = Client("node_add", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  c = Client("node_stop_master", [])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_node_verify(self, node_list, checkdict, cluster_name):
+    """Request verification of given parameters.
 
+    This is a multi-node call.
 
-def call_version(node_list):
-  """Query node version.
+    """
+    c = Client("node_verify", [checkdict, cluster_name])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-  This is a multi-node call.
+  @staticmethod
+  def call_node_start_master(node, start_daemons):
+    """Tells a node to activate itself as a master.
 
-  """
-  c = Client("version", [])
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+    This is a single-node call.
 
+    """
+    c = Client("node_start_master", [start_daemons])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-def call_blockdev_create(node, bdev, size, on_primary, info):
-  """Request creation of a given block device.
+  @staticmethod
+  def call_node_stop_master(node, stop_daemons):
+    """Tells a node to demote itself from master status.
 
-  This is a single-node call.
+    This is a single-node call.
 
-  """
-  params = [bdev.Dumps(), size, on_primary, info]
-  c = Client("blockdev_create", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    """
+    c = Client("node_stop_master", [stop_daemons])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
+  @staticmethod
+  def call_master_info(node_list):
+    """Query master info.
 
-def call_blockdev_remove(node, bdev):
-  """Request removal of a given block device.
+    This is a multi-node call.
 
-  This is a single-node call.
+    """
+    # TODO: should this method query down nodes?
+    c = Client("master_info", [])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-  """
-  c = Client("blockdev_remove", [bdev.Dumps()])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_version(self, node_list):
+    """Query node version.
 
+    This is a multi-node call.
 
-def call_blockdev_assemble(node, disk, on_primary):
-  """Request assembling of a given block device.
+    """
+    c = Client("version", [])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-  This is a single-node call.
+  def call_blockdev_create(self, node, bdev, size, owner, on_primary, info):
+    """Request creation of a given block device.
 
-  """
-  params = [disk.Dumps(), on_primary]
-  c = Client("blockdev_assemble", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    This is a single-node call.
 
+    """
+    params = [bdev.ToDict(), size, owner, on_primary, info]
+    c = Client("blockdev_create", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-def call_blockdev_shutdown(node, disk):
-  """Request shutdown of a given block device.
+  def call_blockdev_remove(self, node, bdev):
+    """Request removal of a given block device.
 
-  This is a single-node call.
+    This is a single-node call.
 
-  """
-  c = Client("blockdev_shutdown", [disk.Dumps()])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    """
+    c = Client("blockdev_remove", [bdev.ToDict()])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
+  def call_blockdev_rename(self, node, devlist):
+    """Request rename of the given block devices.
 
-def call_blockdev_addchild(node, bdev, ndev):
-  """Request adding a new child to a (mirroring) device.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    params = [(d.ToDict(), uid) for d, uid in devlist]
+    c = Client("blockdev_rename", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  params = [bdev.Dumps(), ndev.Dumps()]
-  c = Client("blockdev_addchild", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_blockdev_assemble(self, node, disk, owner, on_primary):
+    """Request assembling of a given block device.
 
+    This is a single-node call.
 
-def call_blockdev_removechild(node, bdev, ndev):
-  """Request removing a new child from a (mirroring) device.
+    """
+    params = [disk.ToDict(), owner, on_primary]
+    c = Client("blockdev_assemble", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  This is a single-node call.
+  def call_blockdev_shutdown(self, node, disk):
+    """Request shutdown of a given block device.
 
-  """
-  params = [bdev.Dumps(), ndev.Dumps()]
-  c = Client("blockdev_removechild", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    This is a single-node call.
 
+    """
+    c = Client("blockdev_shutdown", [disk.ToDict()])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-def call_blockdev_getmirrorstatus(node, disks):
-  """Request status of a (mirroring) device.
+  def call_blockdev_addchildren(self, node, bdev, ndevs):
+    """Request adding a list of children to a (mirroring) device.
 
-  This is a single-node call.
+    This is a single-node call.
 
-  """
-  params = [dsk.Dumps() for dsk in disks]
-  c = Client("blockdev_getmirrorstatus", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    """
+    params = [bdev.ToDict(), [disk.ToDict() for disk in ndevs]]
+    c = Client("blockdev_addchildren", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
+  def call_blockdev_removechildren(self, node, bdev, ndevs):
+    """Request removing a list of children from a (mirroring) device.
 
-def call_blockdev_find(node, disk):
-  """Request identification of a given block device.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    params = [bdev.ToDict(), [disk.ToDict() for disk in ndevs]]
+    c = Client("blockdev_removechildren", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  c = Client("blockdev_find", [disk.Dumps()])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_blockdev_getmirrorstatus(self, node, disks):
+    """Request status of a (mirroring) device.
 
+    This is a single-node call.
 
-def call_upload_file(node_list, file_name):
-  """Upload a file.
+    """
+    params = [dsk.ToDict() for dsk in disks]
+    c = Client("blockdev_getmirrorstatus", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  The node will refuse the operation in case the file is not on the
-  approved file list.
+  def call_blockdev_find(self, node, disk):
+    """Request identification of a given block device.
 
-  This is a multi-node call.
+    This is a single-node call.
 
-  """
-  fh = file(file_name)
-  try:
-    data = fh.read()
-  finally:
-    fh.close()
-  st = os.stat(file_name)
-  params = [file_name, data, st.st_mode, st.st_uid, st.st_gid,
-            st.st_atime, st.st_mtime]
-  c = Client("upload_file", params)
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+    """
+    c = Client("blockdev_find", [disk.ToDict()])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
+  def call_blockdev_close(self, node, disks):
+    """Closes the given block devices.
 
-def call_os_diagnose(node_list):
-  """Request a diagnose of OS definitions.
+    This is a single-node call.
 
-  This is a multi-node call.
+    """
+    params = [cf.ToDict() for cf in disks]
+    c = Client("blockdev_close", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  c = Client("os_diagnose", [])
-  c.connect_list(node_list)
-  c.run()
-  result = c.getresult()
-  new_result = {}
-  for node_name in result:
-    nr = []
-    if result[node_name]:
-      for data in result[node_name]:
-        if data:
-          if isinstance(data, basestring):
-            nr.append(objects.ConfigObject.Loads(data))
-          elif isinstance(data, tuple) and len(data) == 2:
-            nr.append(errors.InvalidOS(data[0], data[1]))
-          else:
-            raise errors.ProgrammerError("Invalid data from"
-                                         " xcserver.os_diagnose")
-    new_result[node_name] = nr
-  return new_result
-
-
-def call_os_get(node_list, name):
-  """Returns an OS definition.
-
-  This is a multi-node call.
+  @staticmethod
+  def call_upload_file(node_list, file_name):
+    """Upload a file.
 
-  """
-  c = Client("os_get", [name])
-  c.connect_list(node_list)
-  c.run()
-  result = c.getresult()
-  new_result = {}
-  for node_name in result:
-    data = result[node_name]
-    if isinstance(data, basestring):
-      new_result[node_name] = objects.ConfigObject.Loads(data)
-    elif isinstance(data, tuple) and len(data) == 2:
-      new_result[node_name] = errors.InvalidOS(data[0], data[1])
+    The node will refuse the operation in case the file is not on the
+    approved file list.
+
+    This is a multi-node call.
+
+    """
+    fh = file(file_name)
+    try:
+      data = fh.read()
+    finally:
+      fh.close()
+    st = os.stat(file_name)
+    params = [file_name, data, st.st_mode, st.st_uid, st.st_gid,
+              st.st_atime, st.st_mtime]
+    c = Client("upload_file", params)
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
+
+  def call_os_diagnose(self, node_list):
+    """Request a diagnose of OS definitions.
+
+    This is a multi-node call.
+
+    """
+    c = Client("os_diagnose", [])
+    c.connect_list(node_list)
+    c.run()
+    result = c.getresult()
+    new_result = {}
+    for node_name in result:
+      if result[node_name]:
+        nr = [objects.OS.FromDict(oss) for oss in result[node_name]]
+      else:
+        nr = []
+      new_result[node_name] = nr
+    return new_result
+
+  def call_os_get(self, node, name):
+    """Returns an OS definition.
+
+    This is a single-node call.
+
+    """
+    c = Client("os_get", [name])
+    c.connect(node)
+    c.run()
+    result = c.getresult().get(node, False)
+    if isinstance(result, dict):
+      return objects.OS.FromDict(result)
     else:
-      new_result[node_name] = data
-  return new_result
+      return result
 
+  def call_hooks_runner(self, node_list, hpath, phase, env):
+    """Call the hooks runner.
 
-def call_hooks_runner(node_list, hpath, phase, env):
-  """Call the hooks runner.
+    Args:
+      - op: the OpCode instance
+      - env: a dictionary with the environment
 
-  Args:
-    - op: the OpCode instance
-    - env: a dictionary with the environment
+    This is a multi-node call.
 
-  This is a multi-node call.
+    """
+    params = [hpath, phase, env]
+    c = Client("hooks_runner", params)
+    c.connect_list(node_list)
+    c.run()
+    result = c.getresult()
+    return result
 
-  """
-  params = [hpath, phase, env]
-  c = Client("hooks_runner", params)
-  c.connect_list(node_list)
-  c.run()
-  result = c.getresult()
-  return result
+  def call_iallocator_runner(self, node, name, idata):
+    """Call an iallocator on a remote node
 
+    Args:
+      - name: the iallocator name
+      - input: the json-encoded input string
 
-def call_blockdev_snapshot(node, cf_bdev):
-  """Request a snapshot of the given block device.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    params = [name, idata]
+    c = Client("iallocator_runner", params)
+    c.connect(node)
+    c.run()
+    result = c.getresult().get(node, False)
+    return result
 
-  """
-  c = Client("blockdev_snapshot", [cf_bdev.Dumps()])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_blockdev_grow(self, node, cf_bdev, amount):
+    """Request a snapshot of the given block device.
 
+    This is a single-node call.
 
-def call_snapshot_export(node, snap_bdev, dest_node, instance):
-  """Request the export of a given snapshot.
+    """
+    c = Client("blockdev_grow", [cf_bdev.ToDict(), amount])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  This is a single-node call.
+  def call_blockdev_snapshot(self, node, cf_bdev):
+    """Request a snapshot of the given block device.
 
-  """
-  params = [snap_bdev.Dumps(), dest_node, instance.Dumps()]
-  c = Client("snapshot_export", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    This is a single-node call.
 
+    """
+    c = Client("blockdev_snapshot", [cf_bdev.ToDict()])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-def call_finalize_export(node, instance, snap_disks):
-  """Request the completion of an export operation.
+  def call_snapshot_export(self, node, snap_bdev, dest_node, instance,
+                           cluster_name):
+    """Request the export of a given snapshot.
 
-  This writes the export config file, etc.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    params = [snap_bdev.ToDict(), dest_node,
+              self._InstDict(instance), cluster_name]
+    c = Client("snapshot_export", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  flat_disks = []
-  for disk in snap_disks:
-    flat_disks.append(disk.Dumps())
-  params = [instance.Dumps(), flat_disks]
-  c = Client("finalize_export", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_finalize_export(self, node, instance, snap_disks):
+    """Request the completion of an export operation.
 
+    This writes the export config file, etc.
 
-def call_export_info(node, path):
-  """Queries the export information in a given path.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    flat_disks = []
+    for disk in snap_disks:
+      flat_disks.append(disk.ToDict())
+    params = [self._InstDict(instance), flat_disks]
+    c = Client("finalize_export", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  c = Client("export_info", [path])
-  c.connect(node)
-  c.run()
-  result = c.getresult().get(node, False)
-  if not result:
+  def call_export_info(self, node, path):
+    """Queries the export information in a given path.
+
+    This is a single-node call.
+
+    """
+    c = Client("export_info", [path])
+    c.connect(node)
+    c.run()
+    result = c.getresult().get(node, False)
+    if not result:
+      return result
+    return objects.SerializableConfigParser.Loads(str(result))
+
+  def call_instance_os_import(self, node, inst, osdev, swapdev,
+                              src_node, src_image, cluster_name):
+    """Request the import of a backup into an instance.
+
+    This is a single-node call.
+
+    """
+    params = [self._InstDict(inst), osdev, swapdev,
+              src_node, src_image, cluster_name]
+    c = Client("instance_os_import", params)
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
+
+  def call_export_list(self, node_list):
+    """Gets the stored exports list.
+
+    This is a multi-node call.
+
+    """
+    c = Client("export_list", [])
+    c.connect_list(node_list)
+    c.run()
+    result = c.getresult()
     return result
-  return objects.SerializableConfigParser.Loads(result)
 
+  def call_export_remove(self, node, export):
+    """Requests removal of a given export.
 
-def call_instance_os_import(node, inst, osdev, swapdev, src_node, src_image):
-  """Request the import of a backup into an instance.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    c = Client("export_remove", [export])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  params = [inst.Dumps(), osdev, swapdev, src_node, src_image]
-  c = Client("instance_os_import", params)
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  @staticmethod
+  def call_node_leave_cluster(node):
+    """Requests a node to clean the cluster information it has.
 
+    This will remove the configuration information from the ganeti data
+    dir.
 
-def call_export_list(node_list):
-  """Gets the stored exports list.
+    This is a single-node call.
 
-  This is a multi-node call.
+    """
+    c = Client("node_leave_cluster", [])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  c = Client("export_list", [])
-  c.connect_list(node_list)
-  c.run()
-  result = c.getresult()
-  return result
+  def call_node_volumes(self, node_list):
+    """Gets all volumes on node(s).
 
+    This is a multi-node call.
 
-def call_export_remove(node, export):
-  """Requests removal of a given export.
+    """
+    c = Client("node_volumes", [])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-  This is a single-node call.
+  def call_test_delay(self, node_list, duration):
+    """Sleep for a fixed time on given node(s).
 
-  """
-  c = Client("export_remove", [export])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+    This is a multi-node call.
 
+    """
+    c = Client("test_delay", [duration])
+    c.connect_list(node_list)
+    c.run()
+    return c.getresult()
 
-def call_node_leave_cluster(node):
-  """Requests a node to clean the cluster information it has.
+  def call_file_storage_dir_create(self, node, file_storage_dir):
+    """Create the given file storage directory.
 
-  This will remove the configuration information from the ganeti data
-  dir.
+    This is a single-node call.
 
-  This is a single-node call.
+    """
+    c = Client("file_storage_dir_create", [file_storage_dir])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  """
-  c = Client("node_leave_cluster", [])
-  c.connect(node)
-  c.run()
-  return c.getresult().get(node, False)
+  def call_file_storage_dir_remove(self, node, file_storage_dir):
+    """Remove the given file storage directory.
 
+    This is a single-node call.
 
-def call_node_volumes(node_list):
-  """Gets all volumes on node(s).
+    """
+    c = Client("file_storage_dir_remove", [file_storage_dir])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
 
-  This is a multi-node call.
+  def call_file_storage_dir_rename(self, node, old_file_storage_dir,
+                                   new_file_storage_dir):
+    """Rename file storage directory.
 
-  """
-  c = Client("node_volumes", [])
-  c.connect_list(node_list)
-  c.run()
-  return c.getresult()
+    This is a single-node call.
+
+    """
+    c = Client("file_storage_dir_rename",
+               [old_file_storage_dir, new_file_storage_dir])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
+
+  @staticmethod
+  def call_jobqueue_update(node_list, file_name, content):
+    """Update job queue.
+
+    This is a multi-node call.
+
+    """
+    c = Client("jobqueue_update", [file_name, content])
+    c.connect_list(node_list)
+    c.run()
+    result = c.getresult()
+    return result
+
+  @staticmethod
+  def call_jobqueue_purge(node):
+    """Purge job queue.
+
+    This is a single-node call.
+
+    """
+    c = Client("jobqueue_purge", [])
+    c.connect(node)
+    c.run()
+    return c.getresult().get(node, False)
+
+  @staticmethod
+  def call_jobqueue_rename(node_list, old, new):
+    """Rename a job queue file.
+
+    This is a multi-node call.
+
+    """
+    c = Client("jobqueue_rename", [old, new])
+    c.connect_list(node_list)
+    c.run()
+    result = c.getresult()
+    return result
+
+
+  @staticmethod
+  def call_jobqueue_set_drain(node_list, drain_flag):
+    """Set the drain flag on the queue.
+
+    This is a multi-node call.
+
+    @type node_list: list
+    @param node_list: the list of nodes to query
+    @type drain_flag: bool
+    @param drain_flag: if True, will set the drain flag, otherwise reset it.
+
+    """
+    c = Client("jobqueue_set_drain", [drain_flag])
+    c.connect_list(node_list)
+    c.run()
+    result = c.getresult()
+    return result
+
+
+  def call_hypervisor_validate_params(self, node_list, hvname, hvparams):
+    """Validate the hypervisor params.
+
+    This is a multi-node call.
+
+    @type node_list: list
+    @param node_list: the list of nodes to query
+    @type hvname: string
+    @param hvname: the hypervisor name
+    @type hvparams: dict
+    @param hvparams: the hypervisor parameters to be validated
+
+    """
+    cluster = self._cfg.GetClusterInfo()
+    hv_full = cluster.FillDict(cluster.hvparams.get(hvname, {}), hvparams)
+    c = Client("hypervisor_validate_params", [hvname, hv_full])
+    c.connect_list(node_list)
+    c.run()
+    result = c.getresult()
+    return result