#!/usr/bin/python
#
-# Copyright (C) 2010, 2011 Google Inc.
+# Copyright (C) 2010, 2011, 2012 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
return FakeSimpleStore
+def _RaiseNotImplemented():
+ """Simple wrapper to raise NotImplementedError.
+
+ """
+ raise NotImplementedError
+
+
class TestRpcProcessor(unittest.TestCase):
def _FakeAddressLookup(self, map):
return lambda node_list: [map.get(node) for node in node_list]
self.assertEqual(req.host, "127.0.0.1")
self.assertEqual(req.port, 24094)
self.assertEqual(req.path, "/version")
- self.assertEqual(req.read_timeout, rpc._TMO_URGENT)
+ self.assertEqual(req.read_timeout, constants.RPC_TMO_URGENT)
req.success = True
req.resp_status_code = http.HTTP_OK
req.resp_body = serializer.DumpJson((True, 123))
http_proc = \
_FakeRequestProcessor(compat.partial(self._GetHttpErrorResponse,
httperrnodes, failnodes))
- result = proc(nodes, "vg_list", body, rpc._TMO_URGENT, NotImplemented,
+ result = proc(nodes, "vg_list", body,
+ constants.RPC_TMO_URGENT, NotImplemented,
_req_process_fn=http_proc)
self.assertEqual(sorted(result.keys()), sorted(nodes))
node_list = ["node%d.example.com" % n for n in range(0, 255, 13)]
node_addr_list = [" ".join(t) for t in zip(node_list, addr_list)]
ssc = GetFakeSimpleStoreClass(lambda _: node_addr_list)
- result = rpc._SsconfResolver(node_list, NotImplemented,
+ result = rpc._SsconfResolver(True, node_list, NotImplemented,
ssc=ssc, nslookup_fn=NotImplemented)
self.assertEqual(result, zip(node_list, addr_list))
ssc = GetFakeSimpleStoreClass(lambda _: [])
node_addr_map = dict(zip(node_list, addr_list))
nslookup_fn = lambda name, family=None: node_addr_map.get(name)
- result = rpc._SsconfResolver(node_list, NotImplemented,
+ result = rpc._SsconfResolver(True, node_list, NotImplemented,
+ ssc=ssc, nslookup_fn=nslookup_fn)
+ self.assertEqual(result, zip(node_list, addr_list))
+
+ def testDisabledSsconfIp(self):
+ addr_list = ["192.0.2.%d" % n for n in range(0, 255, 13)]
+ node_list = ["node%d.example.com" % n for n in range(0, 255, 13)]
+ ssc = GetFakeSimpleStoreClass(_RaiseNotImplemented)
+ node_addr_map = dict(zip(node_list, addr_list))
+ nslookup_fn = lambda name, family=None: node_addr_map.get(name)
+ result = rpc._SsconfResolver(False, node_list, NotImplemented,
ssc=ssc, nslookup_fn=nslookup_fn)
self.assertEqual(result, zip(node_list, addr_list))
ssc = GetFakeSimpleStoreClass(lambda _: node_addr_list)
node_addr_map = dict(zip(node_list[:n], addr_list[:n]))
nslookup_fn = lambda name, family=None: node_addr_map.get(name)
- result = rpc._SsconfResolver(node_list, NotImplemented,
+ result = rpc._SsconfResolver(True, node_list, NotImplemented,
ssc=ssc, nslookup_fn=nslookup_fn)
self.assertEqual(result, zip(node_list, addr_list))
node_list = ["node%d.example.com" % n for n in range(0, 255, 11)]
node_addr_list = [" ".join(t) for t in zip(node_list, addr_list)]
ssc = GetFakeSimpleStoreClass(lambda _: node_addr_list)
- result = rpc._SsconfResolver(node_list, NotImplemented,
+ result = rpc._SsconfResolver(True, node_list, NotImplemented,
ssc=ssc, nslookup_fn=NotImplemented)
self.assertEqual(result, zip(node_list, addr_list))
class TestRpcClientBase(unittest.TestCase):
def testNoHosts(self):
- cdef = ("test_call", NotImplemented, None, rpc_defs.TMO_SLOW, [],
+ cdef = ("test_call", NotImplemented, None, constants.RPC_TMO_SLOW, [],
None, None, NotImplemented)
http_proc = _FakeRequestProcessor(NotImplemented)
client = rpc._RpcClientBase(rpc._StaticResolver([]), NotImplemented,
AT2: hash,
}
- cdef = ("test_call", NotImplemented, None, rpc_defs.TMO_NORMAL, [
+ cdef = ("test_call", NotImplemented, None, constants.RPC_TMO_NORMAL, [
("arg0", None, NotImplemented),
("arg1", AT1, NotImplemented),
("arg1", AT2, NotImplemented),
res.payload = sum(res.payload)
return res
- cdef = ("test_call", NotImplemented, None, rpc_defs.TMO_NORMAL, [],
+ cdef = ("test_call", NotImplemented, None, constants.RPC_TMO_NORMAL, [],
None, _PostProc, NotImplemented)
# Seeded random generator
self.assertEqual(len(data), 1)
return data[0] + node
- cdef = ("test_call", NotImplemented, None, rpc_defs.TMO_NORMAL, [
+ cdef = ("test_call", NotImplemented, None, constants.RPC_TMO_NORMAL, [
("arg0", None, NotImplemented),
], _PreProc, None, NotImplemented)
]
for (resolver_opts, arg0, expected) in tests:
- cdef = ("test_call", NotImplemented, resolver_opts, rpc_defs.TMO_NORMAL, [
+ cdef = ("test_call", NotImplemented, resolver_opts,
+ constants.RPC_TMO_NORMAL, [
("arg0", None, NotImplemented),
], None, None, NotImplemented)
class _FakeConfigForRpcRunner:
GetAllNodesInfo = NotImplemented
+ def __init__(self, cluster=NotImplemented):
+ self._cluster = cluster
+
def GetNodeInfo(self, name):
return objects.Node(name=name)
+ def GetClusterInfo(self):
+ return self._cluster
+
+ def GetInstanceDiskParams(self, _):
+ return constants.DISK_DT_DEFAULTS
+
class TestRpcRunner(unittest.TestCase):
def testUploadFile(self):
self.assertEqual(uldata[2], st.st_mode)
self.assertEqual(uldata[3], "user%s" % os.getuid())
self.assertEqual(uldata[4], "group%s" % os.getgid())
- self.assertEqual(uldata[5], st.st_atime)
+ self.assertTrue(uldata[5] is not None)
self.assertEqual(uldata[6], st.st_mtime)
req.success = True
req.resp_body = serializer.DumpJson((True, None))
http_proc = _FakeRequestProcessor(_VerifyRequest)
- cfg = _FakeConfigForRpcRunner()
- runner = rpc.RpcRunner(cfg, None, _req_process_fn=http_proc,
- _getents=mocks.FakeGetentResolver)
+
+ std_runner = rpc.RpcRunner(_FakeConfigForRpcRunner(), None,
+ _req_process_fn=http_proc,
+ _getents=mocks.FakeGetentResolver)
+
+ cfg_runner = rpc.ConfigRunner(None, ["192.0.2.13"],
+ _req_process_fn=http_proc,
+ _getents=mocks.FakeGetentResolver)
nodes = [
"node1.example.com",
]
- result = runner.call_upload_file(nodes, tmpfile.name)
- self.assertEqual(len(result), len(nodes))
- for (idx, (node, res)) in enumerate(result.items()):
- self.assertFalse(res.fail_msg)
+ for runner in [std_runner, cfg_runner]:
+ result = runner.call_upload_file(nodes, tmpfile.name)
+ self.assertEqual(len(result), len(nodes))
+ for (idx, (node, res)) in enumerate(result.items()):
+ self.assertFalse(res.fail_msg)
+
+ def testEncodeInstance(self):
+ cluster = objects.Cluster(hvparams={
+ constants.HT_KVM: {
+ constants.HV_BLOCKDEV_PREFIX: "foo",
+ },
+ },
+ beparams={
+ constants.PP_DEFAULT: {
+ constants.BE_MAXMEM: 8192,
+ },
+ },
+ os_hvp={},
+ osparams={
+ "linux": {
+ "role": "unknown",
+ },
+ })
+ cluster.UpgradeConfig()
+
+ inst = objects.Instance(name="inst1.example.com",
+ hypervisor=constants.HT_FAKE,
+ os="linux",
+ hvparams={
+ constants.HT_KVM: {
+ constants.HV_BLOCKDEV_PREFIX: "bar",
+ constants.HV_ROOT_PATH: "/tmp",
+ },
+ },
+ beparams={
+ constants.BE_MINMEM: 128,
+ constants.BE_MAXMEM: 256,
+ },
+ nics=[
+ objects.NIC(nicparams={
+ constants.NIC_MODE: "mymode",
+ }),
+ ],
+ disk_template=constants.DT_DISKLESS,
+ disks=[])
+ inst.UpgradeConfig()
+
+ cfg = _FakeConfigForRpcRunner(cluster=cluster)
+ runner = rpc.RpcRunner(cfg, None,
+ _req_process_fn=NotImplemented,
+ _getents=mocks.FakeGetentResolver)
+
+ def _CheckBasics(result):
+ self.assertEqual(result["name"], "inst1.example.com")
+ self.assertEqual(result["os"], "linux")
+ self.assertEqual(result["beparams"][constants.BE_MINMEM], 128)
+ self.assertEqual(len(result["hvparams"]), 1)
+ self.assertEqual(len(result["nics"]), 1)
+ self.assertEqual(result["nics"][0]["nicparams"][constants.NIC_MODE],
+ "mymode")
+
+ # Generic object serialization
+ result = runner._encoder((rpc_defs.ED_OBJECT_DICT, inst))
+ _CheckBasics(result)
+
+ result = runner._encoder((rpc_defs.ED_OBJECT_DICT_LIST, 5 * [inst]))
+ map(_CheckBasics, result)
+
+ # Just an instance
+ result = runner._encoder((rpc_defs.ED_INST_DICT, inst))
+ _CheckBasics(result)
+ self.assertEqual(result["beparams"][constants.BE_MAXMEM], 256)
+ self.assertEqual(result["hvparams"][constants.HT_KVM], {
+ constants.HV_BLOCKDEV_PREFIX: "bar",
+ constants.HV_ROOT_PATH: "/tmp",
+ })
+ self.assertEqual(result["osparams"], {
+ "role": "unknown",
+ })
+
+ # Instance with OS parameters
+ result = runner._encoder((rpc_defs.ED_INST_DICT_OSP_DP, (inst, {
+ "role": "webserver",
+ "other": "field",
+ })))
+ _CheckBasics(result)
+ self.assertEqual(result["beparams"][constants.BE_MAXMEM], 256)
+ self.assertEqual(result["hvparams"][constants.HT_KVM], {
+ constants.HV_BLOCKDEV_PREFIX: "bar",
+ constants.HV_ROOT_PATH: "/tmp",
+ })
+ self.assertEqual(result["osparams"], {
+ "role": "webserver",
+ "other": "field",
+ })
+
+ # Instance with hypervisor and backend parameters
+ result = runner._encoder((rpc_defs.ED_INST_DICT_HVP_BEP, (inst, {
+ constants.HT_KVM: {
+ constants.HV_BOOT_ORDER: "xyz",
+ },
+ }, {
+ constants.BE_VCPUS: 100,
+ constants.BE_MAXMEM: 4096,
+ })))
+ _CheckBasics(result)
+ self.assertEqual(result["beparams"][constants.BE_MAXMEM], 4096)
+ self.assertEqual(result["beparams"][constants.BE_VCPUS], 100)
+ self.assertEqual(result["hvparams"][constants.HT_KVM], {
+ constants.HV_BOOT_ORDER: "xyz",
+ })
if __name__ == "__main__":