X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sfadata.py;h=1fc3708757aa5d911aebec77b3babaded21a8b50;hp=42b5642a4fc52b46e70b15fb6b585d9e1ef387d8;hb=e8b04dd7ddc2ffb22d72098400cdbf676453a094;hpb=3431ad2f23fce33c0bbef2d9243939f25aa957b1

diff --git a/sfadata.py b/sfadata.py
index 42b5642..1fc3708 100644
--- a/sfadata.py
+++ b/sfadata.py
@@ -1,9 +1,31 @@
 import os
 import re
 import time
-import subprocess
+from PyQt4.QtCore import QProcess, QString, QStringList
+
 from sfa.util.rspecHelper import RSpec
 
+
+def find_executable(exec_name):
+    """find the given executable in $PATH"""
+    paths = os.getenv("PATH").split(':')
+    for p in paths:
+        exec_path = os.path.join(p, exec_name)
+        if os.path.exists(exec_path):
+            return exec_path
+    return None
+
+def process(command):
+    SFI_CMD = find_executable("sfi.py")
+    arguments = QStringList()
+    for c in command:
+        arguments << QString(c)
+    process = QProcess()
+    process.start(SFI_CMD, arguments)
+    process.waitForFinished( 200000 )
+    print process.readAll()
+
+
 class SfaData:
     defaults = { 'SFI_AUTH' : None,
                  'SFI_USER' : None,
@@ -11,10 +33,12 @@ class SfaData:
                  'SFI_REGISTRY' : "http://www.planet-lab.org:12345",
                  'SFI_AM' : "http://www.planet-lab.org:12346",
                  'SFI_SM' : "http://www.planet-lab.org:12347",
-                 'SFAUI_VERBOSE' : False,
+                 'SFACE_VERBOSE' : False,
+                 'SFACE_DEBUG' : False,
                  }
 
-    def __init__(self):
+    # let the UI set the slicename if that was set by user
+    def __init__(self, slice=None):
         self.read_config()
 
     def read_config(self):
@@ -22,7 +46,7 @@ class SfaData:
         execfile(filename, SfaData.__dict__)
         for (k,v) in SfaData.defaults.items():
             if not hasattr(SfaData,k): setattr(SfaData,k,v)
-        if SfaData.SFAUI_VERBOSE:
+        if SfaData.SFACE_VERBOSE:
             print "After reading config from %s"%filename
             for (k,v) in SfaData.defaults.items():
                 print "%-20s: %r"%(k,getattr(SfaData,k))
@@ -79,26 +103,27 @@ class SfaData:
 
     def trace_command (self, command):
         self._trace=time.time()
-        if self.SFAUI_VERBOSE:
+        if self.SFACE_VERBOSE:
             print time.strftime('%M:%S'),'Invoking',' '.join(command)
+
     def trace_end (self):
-        if self.SFAUI_VERBOSE:
+        if self.SFACE_VERBOSE:
             print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),'Done'
 
     def getRecord(self, hrn):
-        command = ["sfi.py", "-u", self.getUser(), "-a", self.getAuthority(), 
+        command = ["-u", self.getUser(), "-a", self.getAuthority(), 
                    "-r", self.registry(), "-s", self.slicemgr(), "show", hrn]
         self.trace_command(command)
-        text = subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0]
+        process(command)
         self.trace_end()
         return text
 
     def listChildren(self, hrn):
         children = []
-        command=["sfi.py", "-u", self.getUser(), "-a", self.getAuthority(), 
+        command=["-u", self.getUser(), "-a", self.getAuthority(), 
                  "-r", self.registry(), "-s", self.slicemgr(), "list", hrn]
         self.trace_command(command)
-        text = subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0]
+        process(command)
         self.trace_end()
         lines = text.split('\n')
         for line in lines:
@@ -109,12 +134,12 @@ class SfaData:
         return children
 
     def getRSpecFromSM(self):
-        return __getRSpec(self.slicemgr)
+        return self.__getRSpec(self.slicemgr())
 
     def getRSpecFromAM(self):
-        return __getRSpec(self.aggmgr)
+        return self.__getRSpec(self.aggmgr())
 
-    def __getRspec(self, mgr):
+    def __getRSpec(self, mgr):
         slice = self.getSlice()
         # Write RSpec to file for testing.
         filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
@@ -122,11 +147,11 @@ class SfaData:
             os.remove(filename)
         except:
             pass
-        command=["sfi.py", "-u", self.getUser(), "-a", self.getAuthority(), 
+        command=["-u", self.getUser(), "-a", self.getAuthority(), 
                  "-r", self.registry(), "-s", mgr, "resources", 
                  "-o", filename, slice]
         self.trace_command(command)
-        subprocess.call(command)
+        process(command)
         self.trace_end()
         f = open(filename, "r")
         xml = f.read()
@@ -139,10 +164,10 @@ class SfaData:
         f = open(filename, "w")
         f.write(xml)
         f.close()
-        command=["sfi.py", "-u", self.getUser(), "-a", self.getAuthority(), 
+        command=["-u", self.getUser(), "-a", self.getAuthority(), 
                  "-r", self.registry(), "-s", self.slicemgr(), "create", slice, filename]
         self.trace_command(command)
-        subprocess.call(command)
+        process(command)
         self.trace_end()
 
 class PlanetLabData(SfaData):