Merge pull request #205 from grycap/static2

Improve VM info page

Author: micafer

app/__init__.py

@@ -234,15 +234,17 @@ def showvminfo():
             response = im.get_vm_info(infid, vmid, auth_data)
         except Exception as ex:
             flash("Error: %s." % ex, 'error')
+            return redirect(url_for('showinfrastructures'))
 
-        vminfo = {}
-        state = ""
-        nets = ""
-        disks = ""
-        deployment = ""
         if not response.ok:
             flash("Error retrieving VM info: \n" + response.text, 'error')
+            return redirect(url_for('showinfrastructures'))
         else:
+            vminfo = {}
+            state = ""
+            nets = ""
+            disks = ""
+            deployment = ""
             app.logger.debug("VM Info: %s" % response.text)
             radl_json = response.json()["radl"]
             outports = utils.get_out_ports(radl_json)
@@ -308,6 +310,14 @@ def showvminfo():
 
                 cont += 1
 
+            # delete disk info of disks without size
+            for prop_name in ["device", "fstype", "mount_path"]:
+                new_cont = cont
+                prop = "disk.%s.%s" % (new_cont, prop_name)
+                while prop in vminfo:
+                    del vminfo[prop]
+                    new_cont += 1
+
             str_outports = ""
             if outports:
                 for port in outports: