Revision c42be2c0 lib/backend.py

b/lib/backend.py
1489 1489
  allowing any number of instance queries to be done.
1490 1490

  
1491 1491
  @type instance_param_dict: dict of string to tuple of dictionaries, where the
1492
    dictionaries represent: L{objects.Instance}, L{objects.Node}, HvParams,
1493
    BeParams
1492
    dictionaries represent: L{objects.Instance}, L{objects.Node},
1493
    L{objects.NodeGroup}, HvParams, BeParams
1494 1494
  @param instance_param_dict: mapping of instance name to parameters necessary
1495 1495
    for console information retrieval
1496 1496

  
......
1512 1512
  for inst_name in instance_param_dict:
1513 1513
    instance = instance_param_dict[inst_name]["instance"]
1514 1514
    pnode = instance_param_dict[inst_name]["node"]
1515
    group = instance_param_dict[inst_name]["group"]
1515 1516
    hvparams = instance_param_dict[inst_name]["hvParams"]
1516 1517
    beparams = instance_param_dict[inst_name]["beParams"]
1517 1518

  
1518 1519
    instance = objects.Instance.FromDict(instance)
1519 1520
    pnode = objects.Node.FromDict(pnode)
1521
    group = objects.NodeGroup.FromDict(group)
1520 1522

  
1521 1523
    h = get_hv_fn(instance.hypervisor)
1522
    output[inst_name] = h.GetInstanceConsole(instance, pnode, hvparams,
1523
                                             beparams).ToDict()
1524
    output[inst_name] = h.GetInstanceConsole(instance, pnode, group,
1525
                                             hvparams, beparams).ToDict()
1524 1526

  
1525 1527
  return output
1526 1528

  

Also available in: Unified diff