From d6cf41070e3f135bd4aa0f279af6244413f2b361 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 24 Oct 2011 17:43:53 +0200
Subject: [PATCH] rpc: Convert node-related 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 | 68 ------------------------------------
2 files changed, 1 insertion(+), 69 deletions(-)
diff --git a/lib/build/rpc_definitions.py b/lib/build/rpc_definitions.py
index e93cc787d..52fb4fb02 100644
--- a/lib/build/rpc_definitions.py
+++ b/lib/build/rpc_definitions.py
@@ -342,5 +342,5 @@ _MISC_CALLS = [
]
CALLS = {
- "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS),
+ "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS + _NODE_CALLS),
}
diff --git a/lib/rpc.py b/lib/rpc.py
index 2fcb1b955..792a78b5f 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -920,37 +920,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
"""
return self._MultiNodeCall(node_list, "instance_list", [hypervisor_list])
- @_RpcTimeout(_TMO_FAST)
- def call_node_has_ip_address(self, node, address):
- """Checks if a node has the given IP address.
-
- This is a single-node call.
-
- """
- return self._SingleNodeCall(node, "node_has_ip_address", [address])
-
- @_RpcTimeout(_TMO_URGENT)
- def call_node_info(self, node_list, vg_name, hypervisor_type):
- """Return node information.
-
- This will return memory information and volume group size and free
- space.
-
- This is a multi-node call.
-
- @type node_list: list
- @param node_list: the list of nodes to query
- @type vg_name: C{string}
- @param vg_name: 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
-
- """
- return self._MultiNodeCall(node_list, "node_info",
- [vg_name, hypervisor_type])
-
@_RpcTimeout(_TMO_NORMAL)
def call_etc_hosts_modify(self, node, mode, name, ip):
"""Modify hosts file with name
@@ -967,16 +936,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
"""
return self._SingleNodeCall(node, "etc_hosts_modify", [mode, name, ip])
- @_RpcTimeout(_TMO_NORMAL)
- def call_node_verify(self, node_list, checkdict, cluster_name):
- """Request verification of given parameters.
-
- This is a multi-node call.
-
- """
- return self._MultiNodeCall(node_list, "node_verify",
- [checkdict, cluster_name])
-
@classmethod
@_RpcTimeout(_TMO_FAST)
def call_node_start_master_daemons(cls, node, no_voting):
@@ -1367,33 +1326,6 @@ class RpcRunner(_generated_rpc.RpcClientDefault):
return cls._StaticSingleNodeCall(node, "node_leave_cluster",
[modify_ssh_setup])
- @_RpcTimeout(_TMO_FAST)
- def call_node_volumes(self, node_list):
- """Gets all volumes on node(s).
-
- This is a multi-node call.
-
- """
- return self._MultiNodeCall(node_list, "node_volumes", [])
-
- @_RpcTimeout(_TMO_FAST)
- def call_node_demote_from_mc(self, node):
- """Demote a node from the master candidate role.
-
- This is a single-node call.
-
- """
- return self._SingleNodeCall(node, "node_demote_from_mc", [])
-
- @_RpcTimeout(_TMO_NORMAL)
- def call_node_powercycle(self, node, hypervisor):
- """Tries to powercycle a node.
-
- This is a single-node call.
-
- """
- return self._SingleNodeCall(node, "node_powercycle", [hypervisor])
-
@_RpcTimeout(None)
def call_test_delay(self, node_list, duration):
"""Sleep for a fixed time on given node(s).
--
GitLab