From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Thu, 9 Sep 2010 12:33:38 +0000 (+0200)
Subject: plug to sfi.py for getting resources
X-Git-Tag: sface-0.1-1~88
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=7b355516dc4d4dd5b44e02a03d293d696e0566a1

plug to sfi.py for getting resources
---

diff --git a/sfamainscreen.py b/sfamainscreen.py
index 358da31..3ba9c03 100644
--- a/sfamainscreen.py
+++ b/sfamainscreen.py
@@ -37,17 +37,19 @@ class SliceWidget(QWidget):
 
     
     # TODO: use the methods from sfa-trunk
-    def rspec_get_networks(self, rspec):
+    def rspec_get_networks(self, rspec_string):
+        rspec = RSpec (rspec_string)
         return rspec.rspec.xpath("./network[@name]/@name")
-    def rspec_get_nodes_from_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()