From: Dimitris Aragiorgis <dimara@grnet.gr>
Date: Fri, 12 Jul 2013 12:34:07 +0000 (+0300)
Subject: (grnet) Hotplug: cfgupgrade for deprecated fields
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/0500f6fd4b4edafeec2c43b1a0b18dc5d9f81487

(grnet) Hotplug: cfgupgrade for deprecated fields

Add cfgupgrade so that we remove any deprecated fields hotplug
implementation used in the past.

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>
---

diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 6a8d5a4..0d12b3e 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -170,6 +170,11 @@ def UpgradeInstances(config_data):
           print("NIC with network name %s found."
                 " Substituting with uuid %s." % (name, uuid))
           nic["network"] = uuid
+      try:
+        del nic["idx"]
+        print("Deleting deprecated idx")
+      except KeyError:
+        pass
 
     if "disks" not in iobj:
       raise Error("Instance '%s' doesn't have a disks entry?!" % instance)
@@ -182,6 +187,18 @@ def UpgradeInstances(config_data):
                         " from '%s' to '%s'",
                         instance, idx, current, expected)
         dobj["iv_name"] = expected
+      try:
+        del dobj["idx"]
+        print("Deleting deprecated idx")
+      except KeyError:
+        pass
+
+    for attr in ("dev_idxs", "hotplug_info", "hotplugs", "pci_reservations"):
+      try:
+        del iobj[attr]
+        print("Deleting deprecated %s" % attr)
+      except KeyError:
+        pass
 
 
 def UpgradeRapiUsers():