support for separate ListResources calls for slice and resources

[sface.git] / sface / sfiprocess.py

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 6950554..ee49eb7 100644 (file)
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -3,6 +3,9 @@ import os
 import sys
 import time
 
+from distutils.version import LooseVersion
+from sfa.util.version import version_core
+
 from PyQt4.QtCore import *
 from sface.config import config
 from sface.xmlrpcwindow import get_tracker, XmlrpcReader
@@ -119,20 +122,42 @@ class SfiProcess(QObject):
         self.start()
         return filename
 
+    def retrieveResources(self):
+        mgr = config.getSlicemgr()
+        # Write RSpec to file
+        filename = config.getResourcesRSpecFile()
+        try:
+            os.remove(filename)
+        except:
+            pass
+        args = ["-u", config.getUser(), "-a", config.getAuthority(),
+                "-r", config.getRegistry(), "-s", mgr, "resources",
+                "-o", filename]
+
+        self.__init_command(args)
+        self.start()
+        return filename
+
 
     def listRecords(self, hrn, rectype=None, filename=None):
         args = ["-u", config.getUser(), "-a", config.getAuthority(),
                 "-r", config.getRegistry(), "-s", config.getSlicemgr(), "list", hrn]
 
-        if filename:
-            # we can't tell whether SFI will create one file or many, so delete
-            # leftovers from last time, then we'll know what we got, after we get it.
-            if os.path.exists(filename):
-                os.remove(filename)
-            if os.path.exists(filename + ".1"):
-                os.remove(filename + ".1")
-            args.append("-o")
-            args.append(filename)
+        if not filename:
+            if LooseVersion(version_core()['code_tag']) <= LooseVersion("1.0-35"):
+                # DEPRECATED
+                filename = config.getAuthorityListRecordFile()
+            else:
+                filename = config.getAuthorityListFile()
+
+        # we can't tell whether SFI will create one file or many, so delete
+        # leftovers from last time, then we'll know what we got, after we get it.
+        if os.path.exists(filename):
+            os.remove(filename)
+        if os.path.exists(filename + ".1"):
+            os.remove(filename + ".1")
+        args.append("-o")
+        args.append(filename)
 
         if rectype:
             args.append("-t")