Revision 691744c4 scripts/gnt-instance

b/scripts/gnt-instance
296 296
  if opts.nics:
297 297
    try:
298 298
      nic_max = max(int(nidx[0])+1 for nidx in opts.nics)
299
    except ValueError, err:
299
    except (TypeError, ValueError), err:
300 300
      raise errors.OpPrereqError("Invalid NIC index passed: %s" % str(err))
301 301
    nics = [{}] * nic_max
302 302
    for nidx, ndict in opts.nics:
......
324 324
      opts.disks = [(0, {"size": opts.sd_size})]
325 325
    try:
326 326
      disk_max = max(int(didx[0])+1 for didx in opts.disks)
327
    except ValueError, err:
327
    except (TypeError, ValueError), err:
328 328
      raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err))
329 329
    disks = [{}] * disk_max
330 330
    for didx, ddict in opts.disks:
......
333 333
        raise errors.OpPrereqError("Missing size for disk %d" % didx)
334 334
      try:
335 335
        ddict["size"] = utils.ParseUnit(ddict["size"])
336
      except ValueError, err:
336
      except (TypeError, ValueError), err:
337 337
        raise errors.OpPrereqError("Invalid disk size for disk %d: %s" %
338 338
                                   (didx, err))
339 339
      disks[didx] = ddict
......
459 459
    for elem in specs['disk_size']:
460 460
      try:
461 461
        size = utils.ParseUnit(elem)
462
      except ValueError, err:
462
      except (TypeError, ValueError), err:
463 463
        raise errors.OpPrereqError("Invalid disk size '%s' for"
464 464
                                   " instance %s: %s" %
465 465
                                   (elem, name, err))
......
674 674
  disk = args[1]
675 675
  try:
676 676
    disk = int(disk)
677
  except ValueError, err:
677
  except (TypeError, ValueError), err:
678 678
    raise errors.OpPrereqError("Invalid disk index: %s" % str(err))
679 679
  amount = utils.ParseUnit(args[2])
680 680
  op = opcodes.OpGrowDisk(instance_name=instance, disk=disk, amount=amount,
......
806 806
  else:
807 807
    try:
808 808
      disks = [int(i) for i in opts.disks.split(",")]
809
    except ValueError, err:
809
    except (TypeError, ValueError), err:
810 810
      raise errors.OpPrereqError("Invalid disk index passed: %s" % str(err))
811 811
  cnt = [opts.on_primary, opts.on_secondary,
812 812
         new_2ndary is not None, iallocator is not None].count(True)
......
1211 1211
    try:
1212 1212
      nic_op = int(nic_op)
1213 1213
      opts.nics[idx] = (nic_op, nic_dict)
1214
    except ValueError:
1214
    except (TypeError, ValueError):
1215 1215
      pass
1216 1216

  
1217 1217
  for idx, (disk_op, disk_dict) in enumerate(opts.disks):
1218 1218
    try:
1219 1219
      disk_op = int(disk_op)
1220 1220
      opts.disks[idx] = (disk_op, disk_dict)
1221
    except ValueError:
1221
    except (TypeError, ValueError):
1222 1222
      pass
1223 1223
    if disk_op == constants.DDM_ADD:
1224 1224
      if 'size' not in disk_dict:

Also available in: Unified diff