New diskutil.getHumanDiskLabel to centralize formatting of disk name …

…for user

Signed-off-by: Yann Dirson <[email protected]>

diskutil.py

@@ -392,6 +392,10 @@ def getHumanDiskName(disk):
         return disk[5:]
     return disk
 
+def getHumanDiskLabel(disk):
+    (vendor, model, size) = getExtendedDiskInfo(disk)
+    return "%s - %s [%s %s]" % (getHumanDiskName(disk), getHumanDiskSize(size), vendor, model)
+
 # given a list of disks, work out which ones are part of volume
 # groups that will cause a problem if we install XE to those disks:
 def findProblematicVGs(disks):

tui/installer/screens.py

@@ -556,9 +556,7 @@ def select_primary_disk(answers):
         (boot, root, state, storage, logs) = diskutil.probeDisk(de)
         if storage[0]:
             target_is_sr[de] = True
-        (vendor, model, size) = diskutil.getExtendedDiskInfo(de)
-        stringEntry = "%s - %s [%s %s]" % (diskutil.getHumanDiskName(de), diskutil.getHumanDiskSize(size), vendor, model)
-        e = (stringEntry, de)
+        e = (diskutil.getHumanDiskLabel(de), de)
         entries.append(e)
 
     # we should have at least one disk
@@ -665,9 +663,7 @@ def select_guest_disks(answers):
     # Make a list of entries: (text, item)
     entries = []
     for de in diskEntries:
-        (vendor, model, size) = diskutil.getExtendedDiskInfo(de)
-        entry = "%s - %s [%s %s]" % (diskutil.getHumanDiskName(de), diskutil.getHumanDiskSize(size), vendor, model)
-        entries.append((entry, de))
+        entries.append((diskutil.getHumanDiskLabel(de), de))
 
     text = TextboxReflowed(54, "Which disks would you like to use for %s storage?  \n\nOne storage repository will be created that spans the selected disks.  You can choose not to prepare any storage if you wish to create an advanced configuration after installation." % BRAND_GUEST)
     buttons = ButtonBar(tui.screen, [('Ok', 'ok'), ('Back', 'back')])