From 54498047517fa48496e89b6a3445de0571abda9a Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 24 Oct 2011 17:39:57 +0200
Subject: [PATCH] rpc: Convert X509 calls
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/build/rpc_definitions.py | 2 +-
lib/rpc.py | 24 ------------------------
2 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/lib/build/rpc_definitions.py b/lib/build/rpc_definitions.py
index 65e38eaf3..b1a0eed24 100644
--- a/lib/build/rpc_definitions.py
+++ b/lib/build/rpc_definitions.py
@@ -342,5 +342,5 @@ _MISC_CALLS = [
]
CALLS = {
- "RpcClientDefault": _IMPEXP_CALLS,
+ "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS),
}
diff --git a/lib/rpc.py b/lib/rpc.py
index e1f0f0805..4f8fa4ef9 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -1518,30 +1518,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
return self._MultiNodeCall(node_list, "hypervisor_validate_params",
[hvname, hv_full])
- @_RpcTimeout(_TMO_NORMAL)
- def call_x509_cert_create(self, node, validity):
- """Creates a new X509 certificate for SSL/TLS.
-
- This is a single-node call.
-
- @type validity: int
- @param validity: Validity in seconds
-
- """
- return self._SingleNodeCall(node, "x509_cert_create", [validity])
-
- @_RpcTimeout(_TMO_NORMAL)
- def call_x509_cert_remove(self, node, name):
- """Removes a X509 certificate.
-
- This is a single-node call.
-
- @type name: string
- @param name: Certificate name
-
- """
- return self._SingleNodeCall(node, "x509_cert_remove", [name])
-
@_RpcTimeout(_TMO_NORMAL)
def call_import_start(self, node, opts, instance, component,
dest, dest_args):
--
GitLab