from PyQt4.QtCore import *
from sface.config import config
-from sface.xmlrpcwindow import XmlrpcTracker, XmlrpcReader
+from sface.xmlrpcwindow import get_tracker, XmlrpcReader
def find_executable(exec_name):
"""find the given executable in $PATH"""
self.processFinished)
self.xmlrpcreader = XmlrpcReader() # this one is for parsing XMLRPC responses
- self.xmlrpctracker = XmlrpcTracker() # this one is for the debug window
# holds aggregate output from processStandardOutput(); used by xmlrpc
# tracker.
self.trace_end()
self.emit(SIGNAL("finished()"))
- def __getRSpec(self, mgr):
+ def getFaultString(self):
+ if self.faults == []:
+ return None
+
+ return self.faults[0].get("faultString","") + " (" + self.faults[0].get("faultCode","") + ")"
+
+ def retrieveRspec(self):
slice = config.getSlice()
- # Write RSpec to file for testing.
- filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
+ mgr = config.getSlicemgr()
+ # Write RSpec to file
+ filename = config.fullpath ("%s.rspec"%slice)
try:
os.remove(filename)
except:
self.start()
return filename
- def getRSpecFromSM(self):
- return self.__getRSpec(config.getSlicemgr())
-
-# def getRSpecFromAM(self):
-# return self.__getRSpec(config.getAggmgr())
def listRecords(self, hrn, rectype=None, filename=None):
args = ["-u", config.getUser(), "-a", config.getAuthority(),
self.getRecord(config.getAuthority(), config.getAuthorityRecordFile())
def applyRSpec(self, rspec):
- filename = config.getSliceRSpecFile() + "_new"
- rspec.save(filename)
+ # that's what we pass, like in what we'd like to get
+ requested = config.getSliceRSpecFile() + "_new"
+ # that's what we actually receive
+ # just overwrite the slice file as if we'd used 'resources'
+ obtained = config.getSliceRSpecFile()
+ rspec.save(requested)
args = ["-u", config.getUser(), "-a", config.getAuthority(),
"-r", config.getRegistry(), "-s", config.getSlicemgr(), "create",
- config.getSlice(), filename]
+ "-o", obtained,
+ config.getSlice(), requested]
self.__init_command(args)
self.start()
- return filename
def updateRecord(self, filename):
args = ["-u", config.getUser(), "-a", config.getAuthority(),
# command = "%s %s" % (self.exe, self.args.join(" "))
print time.strftime('%H:%M:%S'),"Done [%.3f s]"%(time.time()-self._trace)
if config.debug:
- self.xmlrpctracker.getAndPrint(self.output)
+ get_tracker().getAndPrint(self.output)