Revision 0500f6fd

b/tools/cfgupgrade
170 170
          print("NIC with network name %s found."
171 171
                " Substituting with uuid %s." % (name, uuid))
172 172
          nic["network"] = uuid
173
      try:
174
        del nic["idx"]
175
        print("Deleting deprecated idx")
176
      except KeyError:
177
        pass
173 178

  
174 179
    if "disks" not in iobj:
175 180
      raise Error("Instance '%s' doesn't have a disks entry?!" % instance)
......
182 187
                        " from '%s' to '%s'",
183 188
                        instance, idx, current, expected)
184 189
        dobj["iv_name"] = expected
190
      try:
191
        del dobj["idx"]
192
        print("Deleting deprecated idx")
193
      except KeyError:
194
        pass
195

  
196
    for attr in ("dev_idxs", "hotplug_info", "hotplugs", "pci_reservations"):
197
      try:
198
        del iobj[attr]
199
        print("Deleting deprecated %s" % attr)
200
      except KeyError:
201
        pass
185 202

  
186 203

  
187 204
def UpgradeRapiUsers():

Also available in: Unified diff