OpenSecurity/bin/ui/configure_dialog.py
changeset 207 ae931a692b54
parent 204 0c3136908f4f
child 220 f5805ee62d80
     1.1 --- a/OpenSecurity/bin/ui/configure_dialog.py	Wed Jun 25 20:56:40 2014 +0200
     1.2 +++ b/OpenSecurity/bin/ui/configure_dialog.py	Wed Jun 25 22:26:34 2014 +0200
     1.3 @@ -219,33 +219,32 @@
     1.4          self._icon_network = QtGui.QIcon()
     1.5          self._icon_network.addPixmap(QtGui.QPixmap(":/opensecurity/gfx/network-workgroup.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
     1.6  
     1.7 +        try:
     1.8  
     1.9 -        #try:
    1.10 +            # get machines
    1.11 +            machines = json.load(urllib2.urlopen('http://127.0.0.1:8080/sdvms'))
    1.12 +            for m in machines:
    1.13 +                i = QtGui.QTreeWidgetItem(self.ui.tvMachines)
    1.14 +                i.setIcon(0, self._icon_machine)
    1.15 +                i.setText(0, m)
    1.16 +                i.setIcon(1, self._icon_network)
    1.17 +                i.setText(1, machines[m])
    1.18  
    1.19 -        # get machines
    1.20 -        machines = json.load(urllib2.urlopen('http://127.0.0.1:8080/sdvms'))
    1.21 -        for m in machines:
    1.22 -            i = QtGui.QTreeWidgetItem(self.ui.tvMachines)
    1.23 -            i.setIcon(0, self._icon_machine)
    1.24 -            i.setText(0, m)
    1.25 -            i.setIcon(1, self._icon_network)
    1.26 -            i.setText(1, machines[m])
    1.27  
    1.28 +                properties = json.load(urllib2.urlopen('http://127.0.0.1:8080/sdvms/' + m))
    1.29 +                for p in properties:
    1.30 +                    j = QtGui.QTreeWidgetItem(i)
    1.31 +                    j.setIcon(0, self._icon_property)
    1.32 +                    j.setText(0, p)
    1.33 +                    j.setText(1, properties[p])
    1.34  
    1.35 -            properties = json.load(urllib2.urlopen('http://127.0.0.1:8080/sdvms/' + m))
    1.36 -            for p in properties:
    1.37 -                j = QtGui.QTreeWidgetItem(i)
    1.38 -                j.setIcon(0, self._icon_property)
    1.39 -                j.setText(0, p)
    1.40 -                j.setText(1, properties[p])
    1.41 +                j.setIcon(0, self._icon_network)
    1.42 +                j.setText(0, 'ip')
    1.43 +                j.setText(1, machines[m])
    1.44  
    1.45 -            j.setIcon(0, self._icon_network)
    1.46 -            j.setText(0, 'ip')
    1.47 -            j.setText(1, machines[m])
    1.48  
    1.49 -
    1.50 -        #except:
    1.51 -        #    pass
    1.52 +        except:
    1.53 +            pass
    1.54  
    1.55  
    1.56