Revision f4d3172f snf-cyclades-app/synnefo/management/pprint.py

b/snf-cyclades-app/synnefo/management/pprint.py
260 260
            return
261 261
        raise e
262 262

  
263
    disks = disks_from_instance(vm_info)
263
    nics = nics_from_instance(vm_info)
264 264
    try:
265
        gnt_disk = filter(lambda disk: disk.get("name") == port.backend_uuid,
266
                          disks)[0]
267
        gnt_disk["instance"] = vm_info["name"]
265
        gnt_nic = filter(lambda nic: nic.get("name") == port.backend_uuid,
266
                         nics)[0]
267
        gnt_nic["instance"] = vm_info["name"]
268 268
    except IndexError:
269 269
        stdout.write("Port %s is not attached to instance %s\n" %
270 270
                     (port.id, vm.id))
271 271
        return
272
    pprint_table(stdout, gnt_disk.items(), None, separator=" | ",
272
    pprint_table(stdout, gnt_nic.items(), None, separator=" | ",
273 273
                 title=title)
274 274

  
275 275
    vm.put_client(client)
......
332 332
                 title=title)
333 333

  
334 334

  
335
def pprint_server_volumes(server, stdout=None, title=None):
336
    if title is None:
337
        title = "Volumes of Server %s" % server.id
338
    if stdout is None:
339
        stdout = sys.stdout
340

  
341
    vols = []
342
    for vol in server.volumes.filter(deleted=False):
343
        vols.append((vol.id, vol.name, vol.index, vol.size, vol.template,
344
                     vol.provider, vol.status, vol.source))
345

  
346
    headers = ["ID", "Name", "Index", "Size", "Template", "Provider",
347
               "Status", "Source"]
348
    pprint_table(stdout, vols, headers, separator=" | ",
349
                 title=title)
350

  
351

  
335 352
def pprint_server_in_ganeti(server, print_jobs=False, stdout=None, title=None):
336 353
    if stdout is None:
337 354
        stdout = sys.stdout
......
366 383
    pprint_table(stdout, nics_values, nics_keys, separator=" | ",
367 384
                 title="NICs of Server %s in Ganeti" % server.id)
368 385

  
386
    stdout.write("\n")
387
    disks = disks_from_instance(server_info)
388
    disks_keys = ["name", "size"]
389
    disks_values = [[disk[key] for key in disks_keys] for disk in disks]
390
    pprint_table(stdout, disks_values, disks_keys, separator=" | ",
391
                 title="Disks of Server %s in Ganeti" % server.id)
392

  
369 393
    if not print_jobs:
370 394
        return
371 395

  

Also available in: Unified diff