Revision 8b46606c scripts/gnt-instance

b/scripts/gnt-instance
302 302 
    nics = [{}] * nic_max
303 303 
    for nidx, ndict in opts.nics:
304 304 
      nidx = int(nidx)
305 
      if not isinstance(ndict, dict):
306 
        msg = "Invalid nic/%d value: expected dict, got %s" % (nidx, ndict)
307 
        raise errors.OpPrereqError(msg)
305 308 
      nics[nidx] = ndict
306 309 
  elif opts.no_nics:
307 310 
    # no nics
......
330 333 
    disks = [{}] * disk_max
331 334 
    for didx, ddict in opts.disks:
332 335 
      didx = int(didx)
333 
      if "size" not in ddict:
336 
      if not isinstance(ddict, dict):
337 
        msg = "Invalid disk/%d value: expected dict, got %s" % (didx, ddict)
338 
        raise errors.OpPrereqError(msg)
339 
      elif "size" not in ddict:
334 340 
        raise errors.OpPrereqError("Missing size for disk %d" % didx)
335 341 
      try:
336 342 
        ddict["size"] = utils.ParseUnit(ddict["size"])

Also available in: Unified diff