Revision 345d395d qa/qa_instance.py

b/qa/qa_instance.py
828 828 
  AssertCommand(["gnt-instance", "stop", instance.name])
829 829 
  # Disks exist: this should fail
830 830 
  _AssertRecreateDisks([], instance, fail=True, destroy=False)
831 
  # Unsupported spindles parameters: fail
832 
  if not qa_config.AreSpindlesSupported():
833 
    _AssertRecreateDisks(["--disk=0:spindles=2"], instance,
834 
                         fail=True, destroy=False)
831 835 
  # Recreate disks in place
832 836 
  _AssertRecreateDisks([], instance)
833 837 
  # Move disks away
......
840 844 
    _AssertRecreateDisks(["-n", other_seq], instance)
841 845 
  # Move disks back
842 846 
  _AssertRecreateDisks(["-n", orig_seq], instance)
843 
  # Recreate the disks one by one
844 
  for idx in range(0, len(qa_config.GetDiskOptions())):
847 
  # Recreate resized disks
848 
  alldisks = qa_config.GetDiskOptions()
849 
  if qa_config.AreSpindlesSupported():
850 
    build_disks_opt = (lambda idx, disk:
851 
                       ("--disk=%s:size=%s,spindles=%s" %
852 
                        (idx, (utils.ParseUnit(disk["size"]) +
853 
                               utils.ParseUnit(disk["growth"])),
854 
                         disk["spindles"] + disk["spindles-growth"])))
855 
  else:
856 
    build_disks_opt = (lambda idx, disk:
857 
                       ("--disk=%s:size=%s" %
858 
                        (idx, (utils.ParseUnit(disk["size"]) +
859 
                               utils.ParseUnit(disk["growth"])))))
860 
  disk_opts = map(build_disks_opt, range(0, len(alldisks)), (alldisks))
861 
  _AssertRecreateDisks(disk_opts, instance)
862 
  # Recreate the disks one by one (with the original size)
863 
  if qa_config.AreSpindlesSupported():
864 
    build_disks_opt = lambda idx, disk: ("--disk=%s:size=%s,spindles=%s" %
865 
                                         (idx, disk["size"], disk["spindles"]))
866 
  else:
867 
    build_disks_opt = lambda idx, disk: ("--disk=%s:size=%s" %
868 
                                         (idx, disk["size"]))
869 
  for (idx, disk) in enumerate(alldisks):
845 870 
    # Only the first call should destroy all the disk
846 871 
    destroy = (idx == 0)
847 
    _AssertRecreateDisks(["--disk=%s" % idx], instance, destroy=destroy,
848 
                         check=False)
872 
    _AssertRecreateDisks([build_disks_opt(idx, disk)], instance,
873 
                         destroy=destroy, check=False)
849 874 
  # This and InstanceCheck decoration check that the disks are working
850 875 
  AssertCommand(["gnt-instance", "reinstall", "-f", instance.name])
851 876 
  AssertCommand(["gnt-instance", "start", instance.name])

Also available in: Unified diff