X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=9b834fab6832aa8fbeaa7c128a95416de735c7c4;hp=6d32a80e1b71d52149f82613b9fe352c72d0cca0;hb=7e1529e1c299394465308aebaed5ffb755d1007a;hpb=afea939e2c58ee09739f8856943f90c36e93782a

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 6d32a80..9b834fa 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -1,9 +1,12 @@
 
+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
 
 
@@ -28,6 +31,8 @@ class SliceWidget(QWidget):
         slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
         slicename.setScaledContents(False)
 
+        self.status = QLabel("")
+
         hlayout = QHBoxLayout()
         hlayout.addWidget(slicename)
         hlayout.addStretch()
@@ -36,25 +41,40 @@ class SliceWidget(QWidget):
         layout = QVBoxLayout()
         layout.addLayout(hlayout)
         layout.addWidget(self.nodeView)
+        layout.addWidget(self.status)
         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()
         
+    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.status.setText("Slice not set yet!")
             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.status.setText("Updating slice data. This may take some time...")
+        
+        self.connect(self.process, SIGNAL('finished()'), self.refreshFinished)
+
+    def refreshFinished(self):
+        del self.process
+        self.status.setText("Slice data updated.")
+        self.updateView()
+
+    def updateView(self):
+        rspec_string = self.readSliceRSpec()
+        networks = rspec_get_networks(rspec_string)
         networks.reverse()
 
         for network in networks:
@@ -63,15 +83,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):