Revision 8b46606c scripts/gnt-backup

b/scripts/gnt-backup
104 104
    nics = [{}] * nic_max
105 105
    for nidx, ndict in opts.nics.items():
106 106
      nidx = int(nidx)
107
      if not isinstance(ndict, dict):
108
        msg = "Invalid nic/%d value: expected dict, got %s" % (nidx, ndict)
109
        raise errors.OpPrereqError(msg)
107 110
      nics[nidx] = ndict
108 111
  elif opts.no_nics:
109 112
    # no nics
......
132 135
    disks = [{}] * disk_max
133 136
    for didx, ddict in opts.disks:
134 137
      didx = int(didx)
135
      if "size" not in ddict:
138
      if not isinstance(ddict, dict):
139
        msg = "Invalid disk/%d value: expected dict, got %s" % (didx, ddict)
140
        raise errors.OpPrereqError(msg)
141
      elif "size" not in ddict:
136 142
        raise errors.OpPrereqError("Missing size for disk %d" % didx)
137 143
      try:
138 144
        ddict["size"] = utils.ParseUnit(ddict["size"])

Also available in: Unified diff