Revision a09f9847

b/autotools/build-rpc
191 191
    assert module.MULTI == _MULTI
192 192

  
193 193
    for (clsname, calls) in module.CALLS.items():
194
      _WriteBaseClass(sw, clsname, calls)
194
      _WriteBaseClass(sw, clsname, calls.values())
195 195

  
196 196
  print buf.getvalue()
197 197

  
b/lib/rpc_defs.py
36 36

  
37 37
"""
38 38

  
39
from ganeti import utils
40

  
39 41

  
40 42
# Guidelines for choosing timeouts:
41 43
# - call used during watcher: timeout of 1min, _TMO_URGENT
......
65 67
 ED_COMPRESS,
66 68
 ED_BLOCKDEV_RENAME) = range(1, 12)
67 69

  
70

  
71
def _Prepare(calls):
72
  """Converts list of calls to dictionary.
73

  
74
  """
75
  return utils.SequenceToDict(calls)
76

  
77

  
68 78
_FILE_STORAGE_CALLS = [
69 79
  ("file_storage_dir_create", SINGLE, TMO_FAST, [
70 80
    ("file_storage_dir", None, "File storage directory"),
......
381 391
  ]
382 392

  
383 393
CALLS = {
384
  "RpcClientDefault": (_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS + _NODE_CALLS +
385
    _FILE_STORAGE_CALLS + _MISC_CALLS + _INSTANCE_CALLS + _BLOCKDEV_CALLS +
386
    _STORAGE_CALLS),
387
  "RpcClientJobQueue": [
394
  "RpcClientDefault": \
395
    _Prepare(_IMPEXP_CALLS + _X509_CALLS + _OS_CALLS + _NODE_CALLS +
396
             _FILE_STORAGE_CALLS + _MISC_CALLS + _INSTANCE_CALLS +
397
             _BLOCKDEV_CALLS + _STORAGE_CALLS),
398
  "RpcClientJobQueue": _Prepare([
388 399
    ("jobqueue_update", MULTI, TMO_URGENT, [
389 400
      ("file_name", None, None),
390 401
      ("content", ED_COMPRESS, None),
......
393 404
    ("jobqueue_rename", MULTI, TMO_URGENT, [
394 405
      ("rename", None, None),
395 406
      ], None, "Rename job queue file"),
396
    ],
397
  "RpcClientBootstrap": [
407
    ]),
408
  "RpcClientBootstrap": _Prepare([
398 409
    ("node_start_master_daemons", SINGLE, TMO_FAST, [
399 410
      ("no_voting", None, None),
400 411
      ], None, "Starts master daemons on a node"),
......
419 430
      ], None, "Requests a node to clean the cluster information it has"),
420 431
    ("master_info", MULTI, TMO_URGENT, [], None, "Query master info"),
421 432
    ("version", MULTI, TMO_URGENT, [], None, "Query node version"),
422
    ],
423
  "RpcClientConfig": [
433
    ]),
434
  "RpcClientConfig": _Prepare([
424 435
    ("upload_file", MULTI, TMO_NORMAL, [
425 436
      ("file_name", ED_FILE_DETAILS, None),
426 437
      ], None, "Upload a file"),
427 438
    ("write_ssconf_files", MULTI, TMO_NORMAL, [
428 439
      ("values", None, None),
429 440
      ], None, "Write ssconf files"),
430
    ],
441
    ]),
431 442
  }

Also available in: Unified diff