Remove two unused RPC functions

[ganeti-local] / lib / rpc.py

diff --git a/lib/rpc.py b/lib/rpc.py
index b7fff3d..c6e7cb2 100644 (file)
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1002,18 +1002,6 @@ class RpcRunner(object):
     """
     return self._SingleNodeCall(node, "blockdev_snapshot", [cf_bdev.ToDict()])
 
-  def call_snapshot_export(self, node, snap_bdev, dest_node, instance,
-                           cluster_name, idx, debug):
-    """Request the export of a given snapshot.
-
-    This is a single-node call.
-
-    """
-    return self._SingleNodeCall(node, "snapshot_export",
-                                [snap_bdev.ToDict(), dest_node,
-                                 self._InstDict(instance), cluster_name,
-                                 idx, debug])
-
   def call_finalize_export(self, node, instance, snap_disks):
     """Request the completion of an export operation.
 
@@ -1040,17 +1028,6 @@ class RpcRunner(object):
     """
     return self._SingleNodeCall(node, "export_info", [path])
 
-  def call_instance_os_import(self, node, inst, src_node, src_images,
-                              cluster_name, debug):
-    """Request the import of a backup into an instance.
-
-    This is a single-node call.
-
-    """
-    return self._SingleNodeCall(node, "instance_os_import",
-                                [self._InstDict(inst), src_node, src_images,
-                                 cluster_name, debug])
-
   def call_export_list(self, node_list):
     """Gets the stored exports list.
 
@@ -1203,7 +1180,7 @@ class RpcRunner(object):
     return self._MultiNodeCall(node_list, "hypervisor_validate_params",
                                [hvname, hv_full])
 
-  def call_create_x509_certificate(self, node, validity):
+  def call_x509_cert_create(self, node, validity):
     """Creates a new X509 certificate for SSL/TLS.
 
     This is a single-node call.
@@ -1212,9 +1189,9 @@ class RpcRunner(object):
     @param validity: Validity in seconds
 
     """
-    return self._SingleNodeCall(node, "create_x509_certificate", [validity])
+    return self._SingleNodeCall(node, "x509_cert_create", [validity])
 
-  def call_remove_x509_certificate(self, node, name):
+  def call_x509_cert_remove(self, node, name):
     """Removes a X509 certificate.
 
     This is a single-node call.
@@ -1223,7 +1200,7 @@ class RpcRunner(object):
     @param name: Certificate name
 
     """
-    return self._SingleNodeCall(node, "remove_x509_certificate", [name])
+    return self._SingleNodeCall(node, "x509_cert_remove", [name])
 
   def call_import_start(self, node, x509_key_name, source_x509_ca,
                         instance, dest, dest_args):