It will be used by the configuration writer.
---
lib/rpc.py | 4 ++--
test/ganeti.rpc_unittest.py | 40 ++++++++++++++++++++--------------------
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lib/rpc.py b/lib/rpc.py
index c4efad8..0aaf0a1 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -303,7 +303,7 @@ def _CheckConfigNode(name, node):
return (name, ip)
-def _NodeConfigResolver(single_node_fn, all_nodes_fn, hosts):
+def NodeConfigResolver(single_node_fn, all_nodes_fn, hosts):
"""Calculate node addresses using configuration.
"""
@@ -431,7 +431,7 @@ class RpcRunner(_generated_rpc.RpcClientDefault,
_generated_rpc.RpcClientDefault.__init__(self)
self._cfg = context.cfg
- self._proc = _RpcProcessor(compat.partial(_NodeConfigResolver,
+ self._proc = _RpcProcessor(compat.partial(NodeConfigResolver,
self._cfg.GetNodeInfo,
self._cfg.GetAllNodesInfo),
netutils.GetDaemonPort(constants.NODED),
diff --git a/test/ganeti.rpc_unittest.py b/test/ganeti.rpc_unittest.py
index c434ad4..753997f 100755
--- a/test/ganeti.rpc_unittest.py
+++ b/test/ganeti.rpc_unittest.py
@@ -371,26 +371,26 @@ class TestNodeConfigResolver(unittest.TestCase):
return objects.Node(name=name, offline=True, primary_ip="192.0.2.100")
def testSingleOnline(self):
- self.assertEqual(rpc._NodeConfigResolver(self._GetSingleOnlineNode,
- NotImplemented,
- ["node90.example.com"]),
+ self.assertEqual(rpc.NodeConfigResolver(self._GetSingleOnlineNode,
+ NotImplemented,
+ ["node90.example.com"]),
[("node90.example.com", "192.0.2.90")])
def testSingleOffline(self):
- self.assertEqual(rpc._NodeConfigResolver(self._GetSingleOfflineNode,
- NotImplemented,
- ["node100.example.com"]),
+ self.assertEqual(rpc.NodeConfigResolver(self._GetSingleOfflineNode,
+ NotImplemented,
+ ["node100.example.com"]),
[("node100.example.com", rpc._OFFLINE)])
def testUnknownSingleNode(self):
- self.assertEqual(rpc._NodeConfigResolver(lambda _: None, NotImplemented,
- ["node110.example.com"]),
+ self.assertEqual(rpc.NodeConfigResolver(lambda _: None, NotImplemented,
+ ["node110.example.com"]),
[("node110.example.com", "node110.example.com")])
def testMultiEmpty(self):
- self.assertEqual(rpc._NodeConfigResolver(NotImplemented,
- lambda: {},
- []),
+ self.assertEqual(rpc.NodeConfigResolver(NotImplemented,
+ lambda: {},
+ []),
[])
def testMultiSomeOffline(self):
@@ -401,18 +401,18 @@ class TestNodeConfigResolver(unittest.TestCase):
for i in range(1, 255))
# Resolve no names
- self.assertEqual(rpc._NodeConfigResolver(NotImplemented,
- lambda: nodes,
- []),
+ self.assertEqual(rpc.NodeConfigResolver(NotImplemented,
+ lambda: nodes,
+ []),
[])
# Offline, online and unknown hosts
- self.assertEqual(rpc._NodeConfigResolver(NotImplemented,
- lambda: nodes,
- ["node3.example.com",
- "node92.example.com",
- "node54.example.com",
- "unknown.example.com",]), [
+ self.assertEqual(rpc.NodeConfigResolver(NotImplemented,
+ lambda: nodes,
+ ["node3.example.com",
+ "node92.example.com",
+ "node54.example.com",
+ "unknown.example.com",]), [
("node3.example.com", rpc._OFFLINE),
("node92.example.com", "192.0.2.92"),
("node54.example.com", rpc._OFFLINE),
--
1.7.6
