X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=15f0ed019aa261b662c8cb1ff0e56b4e242ab697;hp=f566b9913e44c064eba556eba9b81a485aefef00;hb=69b247b9b7075f35257193dbb7df919ce6befa9e;hpb=e095c7423002644d129cef273f3a63646903b788

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index f566b99..15f0ed0 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -1,15 +1,17 @@
 
-from PyQt4.QtCore import Qt, QString, SIGNAL
-from PyQt4.QtGui import QWidget, QLabel, QTreeView, QStandardItemModel, QVBoxLayout, QSizePolicy
+import os
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
 
 from sfa.util.rspecHelper import RSpec
-
+from sface.sfahelper import *
 from sface.sficonfig import config
+from sface.sfiprocess import SfiProcess
 from sface.screens.sfascreen import SfaScreen
 
 
 class SliceWidget(QWidget):
-    def __init__(self, parent=None):
+    def __init__(self, parent):
         QWidget.__init__(self, parent)
 
         self.nodeView = QTreeView(self)
@@ -24,48 +26,52 @@ class SliceWidget(QWidget):
 
         self.nodeView.setModel(self.nodeModel)
 
-        label = QLabel("<a href='refresh'>Refresh</a>", self)
-        label.setScaledContents(False)
-        self.connect(label, SIGNAL('linkActivated(QString)'), self.refresh)
-
+        refresh = QLabel("<a href='refresh'>Refresh</a>", self)
+        refresh.setScaledContents(False)
         slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
+        slicename.setScaledContents(False)
+
+        hlayout = QHBoxLayout()
+        hlayout.addWidget(slicename)
+        hlayout.addStretch()
+        hlayout.addWidget(refresh)
 
         layout = QVBoxLayout()
-        layout.addWidget(label)
-        layout.addWidget(slicename)
+        layout.addLayout(hlayout)
         layout.addWidget(self.nodeView)
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
+
+        self.connect(refresh, SIGNAL('linkActivated(QString)'), self.refresh)
+
+        rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
+        if os.path.exists(rspec_file):
+            self.updateView()
         
-    
-    # TODO: use the methods from sfa-trunk
-    def rspec_get_networks(self, rspec_string):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name]/@name")
-    def rspec_get_xml_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name='%s']/site/node" % network)
-    def rspec_get_sliver_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        return rspec.rspec.xpath("./network[@name='%s']/site/node[sliver]/hostname/text()" % network)
-    def rspec_get_other_nodes_from_network(self, rspec_string, network):
-        rspec = RSpec (rspec_string)
-        # xxx todo - could not find the xpath syntax for 'does not have the sliver attribute'
-        return rspec.rspec.xpath("./network[@name='%s']/site/node[~sliver]/hostname/text()" % network)
+    def readSliceRSpec(self):
+        rspec_file = os.path.expanduser("~/.sfi/%s.rspec" % config.getSlice())
+        xml = open(rspec_file).read()
+        return xml
 
     def refresh(self, link=None):
-        data = SfaData()
-        if not data.getSlice(): 
-            print 'slice not set yet'
+        if not config.getSlice():
+            self.parent().setStatus("<font color='red'>Slice not set yet!</font>")
             return
-        if not data.SFACE_DEBUG:
-            rspec_string = data.getRSpecFromSM()
-        else:
-            print 'SFACE_DEBUG : using local file'
-            import os
-            rspec_string = open(os.path.expanduser("~/.sfi/%s.rspec"%data.getSlice())).read()
-
-        networks = self.rspec_get_networks(rspec_string)
+
+        self.process = SfiProcess()
+        outfile = self.process.getRSpecFromSM()
+        self.parent().setStatus("Updating slice data. This may take some time...")
+        
+        self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
+
+    def refreshFinished(self):
+        del self.process
+        self.parent().setStatus("<font color='green'>Slice data updated.</font>")
+        self.updateView()
+
+    def updateView(self):
+        rspec_string = self.readSliceRSpec()
+        networks = rspec_get_networks(rspec_string)
         networks.reverse()
 
         for network in networks:
@@ -74,15 +80,15 @@ class SliceWidget(QWidget):
 #            nodes = self.rspec_get_other_nodes_from_network(rspec_string, network)
 #            for node in nodes: self.addNode(network, node, False)
             # hacky - i'm just gettin used to this xml navigation stuff
-            xml_nodes = self.rspec_get_xml_nodes_from_network(rspec_string, network)
+            xml_nodes = rspec_get_xml_nodes_from_network(rspec_string, network)
             from lxml import etree
             # addNode inserts before, so let's start with the ones that are not in
             for xml_node in xml_nodes:
                 if not xml_node.xpath('sliver'): 
-                    self.addNode(network,xml_node.xpath('hostname/text()')[0],False)
+                    self.addNode(network, xml_node.xpath('hostname/text()')[0],False)
             for xml_node in xml_nodes:
                 if xml_node.xpath('sliver'): 
-                    self.addNode(network,xml_node.xpath('hostname/text()')[0],True)
+                    self.addNode(network, xml_node.xpath('hostname/text()')[0],True)
                 
 
     def addNode(self, testbed, hostname, mark):
@@ -94,11 +100,9 @@ class SliceWidget(QWidget):
         self.nodeModel.setData(self.nodeModel.index(0,2), QString(msg))
 
 
-
 class MainScreen(SfaScreen):
-    def __init__(self, parent=None):
+    def __init__(self, parent):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
         self.init(slice, "Main Window", "PlanetLab Federation GUI")
-#        slice.refresh()