Commit e07b96ce authored by Klaus Aehlig's avatar Klaus Aehlig

Add self to top-level functions that were moved to a class

AssignUuid used to be a top-level definition, hence could
also reference themselves by name. Now they are part of
a class and hence need to be referenced that way.
Signed-off-by: default avatarKlaus Aehlig <aehlig@google.com>
Reviewed-by: default avatarHelga Velroyen <helgav@google.com>
parent 95c2f5e0
......@@ -389,12 +389,13 @@ class CfgUpgrade(object):
" Substituting with uuid %s." % (name, uuid))
nic["network"] = uuid
def AssignUuid(disk):
@classmethod
def AssignUuid(cls, disk):
if not "uuid" in disk:
disk["uuid"] = utils.io.NewUUID()
if "children" in disk:
for d in disk["children"]:
AssignUuid(d)
cls.AssignUuid(d)
def _ConvertDiskAndCheckMissingSpindles(self, iobj, instance):
missing_spindles = False
......@@ -420,7 +421,7 @@ class CfgUpgrade(object):
if not "spindles" in dobj:
missing_spindles = True
AssignUuid(dobj)
self.AssignUuid(dobj)
return missing_spindles
@OrFail("Upgrading instance with spindles")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment