# HG changeset patch
# User Oliver Maurhart <oliver.maurhart@ait.ac.at>
# Date 1403721991 -7200
# Node ID 0cc33b647a4efa2669c067662e3b4a77c31cbd8c
# Parent  009ae01fd5756424b8a65c91c30d883d32f8cf26
machine configuration tab working

diff -r 009ae01fd575 -r 0cc33b647a4e OpenSecurity/bin/opensecurityd.pyw
--- a/OpenSecurity/bin/opensecurityd.pyw	Wed Jun 25 20:42:12 2014 +0200
+++ b/OpenSecurity/bin/opensecurityd.pyw	Wed Jun 25 20:46:31 2014 +0200
@@ -241,7 +241,7 @@
     def GET(self, name):
         log_call(web.ctx.environ)
         global gvm_mgr
-        return gvm_mgr.getVMInfo(name)
+        return json.dumps(gvm_mgr.getVMInfo(name), indent = 4)
 
     def DELETE(self, name):
         log_call(web.ctx.environ)
@@ -311,7 +311,7 @@
         """get the list of SDVMs"""
         log_call(web.ctx.environ)
         global gvm_mgr
-        return gvm_mgr.listSDVM() 
+        return str(gvm_mgr.listSDVM()).replace("'",'"') 
             
     def POST(self):
         """create a new SDVM"""
diff -r 009ae01fd575 -r 0cc33b647a4e OpenSecurity/bin/ui/configure_dialog.py
--- a/OpenSecurity/bin/ui/configure_dialog.py	Wed Jun 25 20:42:12 2014 +0200
+++ b/OpenSecurity/bin/ui/configure_dialog.py	Wed Jun 25 20:46:31 2014 +0200
@@ -180,7 +180,6 @@
         self.ui.edtStatus.setEnabled(False);
         self.ui.edtVersion.setEnabled(False);
         self.ui.tvTemplate.clear()
-        self.ui.tvMachines.clear()
 
         try:
 
@@ -202,15 +201,52 @@
             i.setText(2, str(j['initial_template']['size']))
             i.setText(3, j['initial_template']['path'])
             
-            # get machines
-            j = json.load(urllib2.urlopen('http://127.0.0.1:8080/vms'))
-            for m in j:
-                i = QtGui.QTreeWidgetItem(self.ui.tvMachines)
-                i.setText(0, m)
-
         except:
             pass
 
+        # trigger machine update
+        self.update_machines()
+
+
+    def update_machines(self):
+
+        """Update the machines view"""
+        self.ui.tvMachines.clear()
+        self._icon_machine = QtGui.QIcon()
+        self._icon_machine.addPixmap(QtGui.QPixmap(":/opensecurity/gfx/cpu.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self._icon_property = QtGui.QIcon()
+        self._icon_property.addPixmap(QtGui.QPixmap(":/opensecurity/gfx/configure.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self._icon_network = QtGui.QIcon()
+        self._icon_network.addPixmap(QtGui.QPixmap(":/opensecurity/gfx/network-workgroup.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+
+
+        #try:
+
+        # get machines
+        machines = json.load(urllib2.urlopen('http://127.0.0.1:8080/sdvms'))
+        for m in machines:
+            i = QtGui.QTreeWidgetItem(self.ui.tvMachines)
+            i.setIcon(0, self._icon_machine)
+            i.setText(0, m)
+
+            properties = json.load(urllib2.urlopen('http://127.0.0.1:8080/sdvms/' + m))
+            for p in properties:
+                j = QtGui.QTreeWidgetItem(i)
+                j.setIcon(0, self._icon_property)
+                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())
+
+
+        #except:
+        #    pass
+
+
 
     def update_progress(self):