X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sfamainscreen.py;h=3ba9c03176eaaa3af47d8f4e8f33f8d158cf0b38;hp=db664144e26088551765ee2643bed9ebde3a5e75;hb=7b355516dc4d4dd5b44e02a03d293d696e0566a1;hpb=916d85331e44dea3f42c8d8438099ac8bec85c12

diff --git a/sfamainscreen.py b/sfamainscreen.py
index db66414..3ba9c03 100644
--- a/sfamainscreen.py
+++ b/sfamainscreen.py
@@ -35,25 +35,27 @@ class SliceWidget(QWidget):
         self.connect(label, SIGNAL('linkActivated(QString)'),
                      self.refresh)
 
-
-    def rspec_get_networks(self, rspec):
+    
+    # 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_nodes_of_network(self, rspec, network):
+    def rspec_get_nodes_from_network(self, rspec_string, network):
+        rspec = RSpec (rspec_string)
         return rspec.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network)
 
     def refresh(self, link=None):
         data = SfaData()
-#        xml = data.getRSpecFromSM()
-        import os
-        xml = open(os.path.expanduser("~/.sfi/ple.inria.heartbeat.rspec")).read()
-        rspec = RSpec(xml)
+        rspec = data.getRSpecFromSM()
+#        import os
+#        xml = open(os.path.expanduser("~/.sfi/ple.inria.heartbeat.rspec")).read()
+#        rspec = RSpec(xml)
 
         networks = self.rspec_get_networks(rspec)
         networks.reverse()
 
         for network in networks:
-            nodes = self.rspec_get_nodes_of_network(rspec, network)
+            nodes = self.rspec_get_nodes_from_network(rspec, network)
             for node in nodes:
                 self.addNode(network, node)