cleanup for using the config dir properly, and not an hard-wired ~/.sfi/

[sface.git] / sface / sfiprocess.py

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 829abab..e06bf9a 100644 (file)
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -41,6 +41,9 @@ class SfiProcess(QObject):
 
     def __init_command(self, args):
         self.args = QStringList()
+        self.args << "-d"
+        self.args << config.get_dirname()
+
         if config.debug:
             # this shows xmlrpc conversation, see sfi.py docs.
             self.args << QString('-D')
@@ -86,7 +89,7 @@ class SfiProcess(QObject):
     def __getRSpec(self, mgr):
         slice = config.getSlice()
         # Write RSpec to file for testing.
-        filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
+        filename = config.fullpath ("%s.rspec"%slice)
         try:
             os.remove(filename)
         except:
@@ -157,6 +160,12 @@ class SfiProcess(QObject):
         self.__init_command(args)
         self.start()
 
+    def addRecord(self, filename):
+        args = ["-u", config.getUser(), "-a", config.getAuthority(),
+                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "add", filename]
+        self.__init_command(args)
+        self.start()
+
     def renewSlivers(self, expiration):
         args = ["-u", config.getUser(), "-a", config.getAuthority(),
                 "-r", config.getRegistry(), "-s", config.getSlicemgr(), "renew",