From ef40fbfb41f4fd48e3f74a586fd4a791ae1918e8 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 22 Apr 2010 13:15:57 +0200
Subject: [PATCH] Rename import/export RPC calls to match others
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
daemons/ganeti-noded | 12 ++++++------
lib/rpc.py | 18 +++++++++---------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 7a5ab7a5d..28c6edaad 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -838,7 +838,7 @@ class NodeHttpServer(http.server.HttpServer):
# Crypto
@staticmethod
- def perspective_create_x509_certificate(params):
+ def perspective_x509_cert_create(params):
"""Creates a new X509 certificate for SSL/TLS.
"""
@@ -846,7 +846,7 @@ class NodeHttpServer(http.server.HttpServer):
return backend.CreateX509Certificate(validity)
@staticmethod
- def perspective_remove_x509_certificate(params):
+ def perspective_x509_cert_remove(params):
"""Removes a X509 certificate.
"""
@@ -856,7 +856,7 @@ class NodeHttpServer(http.server.HttpServer):
# Import and export
@staticmethod
- def perspective_start_import_listener(params):
+ def perspective_import_start(params):
"""Starts an import daemon.
"""
@@ -869,7 +869,7 @@ class NodeHttpServer(http.server.HttpServer):
_DecodeImportExportIO(dest,
dest_args))
@staticmethod
- def perspective_start_export(params):
+ def perspective_export_start(params):
"""Starts an export daemon.
"""
@@ -884,14 +884,14 @@ class NodeHttpServer(http.server.HttpServer):
source_args))
@staticmethod
- def perspective_get_import_export_status(params):
+ def perspective_impexp_status(params):
"""Retrieves the status of an import or export daemon.
"""
return backend.GetImportExportStatus(params[0])
@staticmethod
- def perspective_cleanup_import_export(params):
+ def perspective_impexp_cleanup(params):
"""Cleans up after an import or export.
"""
diff --git a/lib/rpc.py b/lib/rpc.py
index b99b49e48..23df3ec3f 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1225,8 +1225,8 @@ class RpcRunner(object):
"""
return self._SingleNodeCall(node, "remove_x509_certificate", [name])
- def call_start_import_listener(self, node, x509_key_name, source_x509_ca,
- instance, dest, dest_args):
+ def call_import_start(self, node, x509_key_name, source_x509_ca,
+ instance, dest, dest_args):
"""Starts a listener for an import.
This is a single-node call.
@@ -1237,12 +1237,12 @@ class RpcRunner(object):
@param instance: Instance object
"""
- return self._SingleNodeCall(node, "start_import_listener",
+ return self._SingleNodeCall(node, "import_start",
[x509_key_name, source_x509_ca,
self._InstDict(instance), dest,
_EncodeImportExportIO(dest, dest_args)])
- def call_start_export(self, node, x509_key_name, dest_x509_ca, host, port,
+ def call_export_start(self, node, x509_key_name, dest_x509_ca, host, port,
instance, source, source_args):
"""Starts an export daemon.
@@ -1254,12 +1254,12 @@ class RpcRunner(object):
@param instance: Instance object
"""
- return self._SingleNodeCall(node, "start_export",
+ return self._SingleNodeCall(node, "export_start",
[x509_key_name, dest_x509_ca, host, port,
self._InstDict(instance), source,
_EncodeImportExportIO(source, source_args)])
- def call_get_import_export_status(self, node, names):
+ def call_impexp_status(self, node, names):
"""Gets the status of an import or export.
This is a single-node call.
@@ -1273,7 +1273,7 @@ class RpcRunner(object):
a status couldn't be retrieved
"""
- result = self._SingleNodeCall(node, "get_import_export_status", [names])
+ result = self._SingleNodeCall(node, "impexp_status", [names])
if not result.fail_msg:
decoded = []
@@ -1288,7 +1288,7 @@ class RpcRunner(object):
return result
- def call_cleanup_import_export(self, node, name):
+ def call_impexp_cleanup(self, node, name):
"""Cleans up after an import or export.
This is a single-node call.
@@ -1299,4 +1299,4 @@ class RpcRunner(object):
@param name: Import/export name
"""
- return self._SingleNodeCall(node, "cleanup_import_export", [name])
+ return self._SingleNodeCall(node, "impexp_cleanup", [name])
--
GitLab