From 6945a438ce8b6c0668e296e85662cdf126f378ae Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Tue, 30 Mar 2021 09:48:00 +0200
Subject: [PATCH 1/2] Improve code #119

---
 app/__init__.py | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index e03ce8f57..0e72dd132 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -266,31 +266,18 @@ def showvminfo():
                     disks += Markup('<br/>')
                 disks += Markup('<i class="fa fa-database"></i> <span class="badge badge-secondary">'
                                 '%s</span><br/>' % cont)
-                if "disk.%s.size" % cont in vminfo:
-                    disks += Markup('&nbsp;&nbsp;')
-                    disks += "- Size: %s" % vminfo["disk.%s.size" % cont]
-                    disks += Markup('<br/>')
-                    del vminfo["disk.%s.size" % cont]
-                if "disk.%s.image.url" % cont in vminfo:
-                    disks += Markup('&nbsp;&nbsp;')
-                    disks += "- URL: %s" % vminfo["disk.%s.image.url" % cont]
-                    disks += Markup('<br/>')
-                    del vminfo["disk.%s.image.url" % cont]
-                if "disk.%s.device" % cont in vminfo:
-                    disks += Markup('&nbsp;&nbsp;')
-                    disks += "- Device: %s" % vminfo["disk.%s.device" % cont]
-                    disks += Markup('<br/>')
-                    del vminfo["disk.%s.device" % cont]
-                if "disk.%s.mount_path" % cont in vminfo:
-                    disks += Markup('&nbsp;&nbsp;')
-                    disks += "- Mount path: %s" % vminfo["disk.%s.mount_path" % cont]
-                    disks += Markup('<br/>')
-                    del vminfo["disk.%s.mount_path" % cont]
-                if "disk.%s.fstype" % cont in vminfo:
-                    disks += Markup('&nbsp;&nbsp;')
-                    disks += "- Fstype: %s" % vminfo["disk.%s.fstype" % cont]
-                    disks += Markup('<br/>')
-                    del vminfo["disk.%s.fstype" % cont]
+
+                prop_map = {"size": "Size", "image.url": "URL", "device": "Device", "mount_path": "Mount Path",
+                            "fstype": "F.S. type", "os.flavour": "O.S. Flavor", "os.version": "O.S. Version"}
+                
+                for name, label in prop_map.items():
+                    prop = "disk.%s.%s" % (cont, name)
+                    if prop in vminfo:
+                        disks += Markup('&nbsp;&nbsp;')
+                        disks += "- %s: %s" % (label, vminfo[prop])
+                        disks += Markup('<br/>')
+                        del vminfo[prop]          
+
                 cont += 1
 
         return render_template('vminfo.html', infid=infid, vmid=vmid, vminfo=vminfo,

From 6adbc6925d5090e50188c72ea8e693f3309b7bdf Mon Sep 17 00:00:00 2001
From: micafer <micafer1@upv.es>
Date: Tue, 30 Mar 2021 09:55:07 +0200
Subject: [PATCH 2/2] Fix style

---
 app/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 0e72dd132..5f4c921e4 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -269,14 +269,13 @@ def showvminfo():
 
                 prop_map = {"size": "Size", "image.url": "URL", "device": "Device", "mount_path": "Mount Path",
                             "fstype": "F.S. type", "os.flavour": "O.S. Flavor", "os.version": "O.S. Version"}
-                
                 for name, label in prop_map.items():
                     prop = "disk.%s.%s" % (cont, name)
                     if prop in vminfo:
                         disks += Markup('&nbsp;&nbsp;')
                         disks += "- %s: %s" % (label, vminfo[prop])
                         disks += Markup('<br/>')
-                        del vminfo[prop]          
+                        del vminfo[prop]
 
                 cont += 1