# HG changeset patch
# User Oliver Maurhart <oliver.maurhart@ait.ac.at>
# Date 1403722600 -7200
# Node ID 0c3136908f4f7cfd938650f21bb5613090b08898
# Parent  0cc33b647a4efa2669c067662e3b4a77c31cbd8c
yet even more sex to the configuration dialog

diff -r 0cc33b647a4e -r 0c3136908f4f OpenSecurity/bin/opensecurityd.pyw
--- a/OpenSecurity/bin/opensecurityd.pyw	Wed Jun 25 20:46:31 2014 +0200
+++ b/OpenSecurity/bin/opensecurityd.pyw	Wed Jun 25 20:56:40 2014 +0200
@@ -231,6 +231,7 @@
         return json.dumps(json.loads(res), indent = 4)
 
 
+
 class os_sdvm:
     """OpenSecurity '/sdvms/[VM]' handler
     
@@ -311,7 +312,12 @@
         """get the list of SDVMs"""
         log_call(web.ctx.environ)
         global gvm_mgr
-        return str(gvm_mgr.listSDVM()).replace("'",'"') 
+
+        d = {}
+        for sdvm in gvm_mgr.listSDVM():
+            d[sdvm] = gvm_mgr.getHostOnlyIP(sdvm)
+
+        return json.dumps(d, indent = 4)
             
     def POST(self):
         """create a new SDVM"""
diff -r 0cc33b647a4e -r 0c3136908f4f OpenSecurity/bin/ui/configure_dialog.py
--- a/OpenSecurity/bin/ui/configure_dialog.py	Wed Jun 25 20:46:31 2014 +0200
+++ b/OpenSecurity/bin/ui/configure_dialog.py	Wed Jun 25 20:56:40 2014 +0200
@@ -228,6 +228,9 @@
             i = QtGui.QTreeWidgetItem(self.ui.tvMachines)
             i.setIcon(0, self._icon_machine)
             i.setText(0, m)
+            i.setIcon(1, self._icon_network)
+            i.setText(1, machines[m])
+
 
             properties = json.load(urllib2.urlopen('http://127.0.0.1:8080/sdvms/' + m))
             for p in properties:
@@ -236,11 +239,9 @@
                 j.setText(0, p)
                 j.setText(1, properties[p])
 
-            ip = urllib2.urlopen('http://127.0.0.1:8080/sdvms/' + m + '/ip')   
-            j = QtGui.QTreeWidgetItem(i)
             j.setIcon(0, self._icon_network)
             j.setText(0, 'ip')
-            j.setText(1, ip.read())
+            j.setText(1, machines[m])
 
 
         #except: