Revision 3a24c527 scripts/gnt-instance

b/scripts/gnt-instance
29 29
from ganeti.cli import *
30 30
from ganeti import cli
31 31
from ganeti import opcodes
32
from ganeti import logger
33 32
from ganeti import constants
34 33
from ganeti import utils
35 34
from ganeti import errors
......
252 251
                       numfields=numfields, data=output)
253 252

  
254 253
  for line in data:
255
    logger.ToStdout(line)
254
    ToStdout(line)
256 255

  
257 256
  return 0
258 257

  
......
418 417
                                  file_storage_dir=specs['file_storage_dir'],
419 418
                                  file_driver=specs['file_driver'])
420 419

  
421
    print '%s: %s' % (name, cli.SendJob([op]))
420
    ToStdout("%s: %s", name, cli.SendJob([op]))
422 421

  
423 422
  return 0
424 423

  
......
438 437
    result = SubmitOpCode(op)
439 438

  
440 439
    if not result:
441
      logger.ToStdout("Can't get the OS list")
440
      ToStdout("Can't get the OS list")
442 441
      return 1
443 442

  
444
    logger.ToStdout("Available OS templates:")
443
    ToStdout("Available OS templates:")
445 444
    number = 0
446 445
    choices = []
447 446
    for entry in result:
448
      logger.ToStdout("%3s: %s" % (number, entry[0]))
447
      ToStdout("%3s: %s", number, entry[0])
449 448
      choices.append(("%s" % number, entry[0], entry[0]))
450 449
      number = number + 1
451 450

  
......
454 453
                       choices)
455 454

  
456 455
    if selected == 'exit':
457
      logger.ToStdout("User aborted reinstall, exiting")
456
      ToStdout("User aborted reinstall, exiting")
458 457
      return 1
459 458

  
460 459
    os = selected
......
526 525
  op = opcodes.OpActivateInstanceDisks(instance_name=instance_name)
527 526
  disks_info = SubmitOrSend(op, opts)
528 527
  for host, iname, nname in disks_info:
529
    print "%s:%s:%s" % (host, iname, nname)
528
    ToStdout("%s:%s:%s", host, iname, nname)
530 529
  return 0
531 530

  
532 531

  
......
581 580
                                   force=opts.force,
582 581
                                   extra_args=opts.extra_args)
583 582
    if multi_on:
584
      logger.ToStdout("Starting up %s" % name)
583
      ToStdout("Starting up %s", name)
585 584
    try:
586 585
      SubmitOrSend(op, opts)
587 586
    except JobSubmittedException, err:
588 587
      _, txt = FormatError(err)
589
      logger.ToStdout("%s" % txt)
588
      ToStdout("%s", txt)
590 589
  return 0
591 590

  
592 591

  
......
636 635
  for name in inames:
637 636
    op = opcodes.OpShutdownInstance(instance_name=name)
638 637
    if multi_on:
639
      logger.ToStdout("Shutting down %s" % name)
638
      ToStdout("Shutting down %s", name)
640 639
    try:
641 640
      SubmitOrSend(op, opts)
642 641
    except JobSubmittedException, err:
643 642
      _, txt = FormatError(err)
644
      logger.ToStdout("%s" % txt)
643
      ToStdout("%s", txt)
645 644
  return 0
646 645

  
647 646

  
......
721 720
  cmd = SubmitOpCode(op)
722 721

  
723 722
  if opts.show_command:
724
    print utils.ShellQuoteArgs(cmd)
723
    ToStdout("%s", utils.ShellQuoteArgs(cmd))
725 724
  else:
726 725
    try:
727 726
      os.execvp(cmd[0], cmd)
728 727
    finally:
729
      sys.stderr.write("Can't run console command %s with arguments:\n'%s'" %
730
                       (cmd, " ".join(argv)))
728
      ToStderr("Can't run console command %s with arguments:\n'%s'",
729
               cmd, " ".join(argv))
731 730
      os._exit(1)
732 731

  
733 732

  
......
812 811
  op = opcodes.OpQueryInstanceData(instances=args, static=opts.static)
813 812
  result = SubmitOpCode(op)
814 813
  if not result:
815
    logger.ToStdout("No instances.")
814
    ToStdout("No instances.")
816 815
    return 1
817 816

  
818 817
  buf = StringIO()
......
883 882
    for device in instance["disks"]:
884 883
      _FormatBlockDevInfo(buf, device, 1, opts.static)
885 884

  
886
  logger.ToStdout(buf.getvalue().rstrip('\n'))
885
  ToStdout(buf.getvalue().rstrip('\n'))
887 886
  return retcode
888 887

  
889 888

  
......
901 900
  """
902 901
  if not (opts.ip or opts.bridge or opts.mac or
903 902
          opts.hypervisor or opts.beparams):
904
    logger.ToStdout("Please give at least one of the parameters.")
903
    ToStderr("Please give at least one of the parameters.")
905 904
    return 1
906 905

  
907 906
  if constants.BE_MEMORY in opts.beparams:
......
919 918
  result = SubmitOrSend(op, opts)
920 919

  
921 920
  if result:
922
    logger.ToStdout("Modified instance %s" % args[0])
921
    ToStdout("Modified instance %s", args[0])
923 922
    for param, data in result:
924
      logger.ToStdout(" - %-5s -> %s" % (param, data))
925
    logger.ToStdout("Please don't forget that these parameters take effect"
926
                    " only at the next start of the instance.")
923
      ToStdout(" - %-5s -> %s", param, data)
924
    ToStdout("Please don't forget that these parameters take effect"
925
             " only at the next start of the instance.")
927 926
  return 0
928 927

  
929 928

  

Also available in: Unified diff