From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 11 May 2012 18:18:10 +0000 (-0400)
Subject: specify -t --type option when calling sfi show
X-Git-Tag: sface-0.9-7~2
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=5a487f5551aff6228d7615a85ff4c84a54d98e85;ds=sidebyside

specify -t --type option when calling sfi show
---

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 6f131a7..089c739 100644
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -221,9 +221,15 @@ class SfiProcess(QObject):
         self.__init_command(args)
         self.start()
 
-    def getRecord(self, hrn, filename=None):
-        args = ["-u", config.getUser(), "-a", config.getAuthority(),
-                "-r", config.getRegistry(), "-s", config.getSlicemgr(), "show", hrn]
+    def getRecord(self, hrn, type=None, filename=None):
+        args = ["-u", config.getUser(), 
+                "-a", config.getAuthority(),
+                "-r", config.getRegistry(), 
+                "-s", config.getSlicemgr(), 
+                "show", hrn]
+        if type:
+            args.append("-t")
+            args.append(type) 
         if filename:
             args.append("-o")
             args.append(filename)
@@ -231,10 +237,10 @@ class SfiProcess(QObject):
         self.start()
 
     def getSliceRecord(self):
-        self.getRecord(config.getSlice(), config.getSliceRecordFile())
+        self.getRecord(config.getSlice(), type="slice", filename=config.getSliceRecordFile())
 
     def getAuthorityRecord(self):
-        self.getRecord(config.getAuthority(), config.getAuthorityRecordFile())
+        self.getRecord(config.getAuthority(), filename=config.getAuthorityRecordFile())
 
     def applyRSpec(self, rspec, aggAddr=None, aggPort=None, saveObtained=True):
         # that's what we pass, like in what we'd like to get
diff --git a/sface/sfirenew.py b/sface/sfirenew.py
index f2cab6b..8d15ba5 100644
--- a/sface/sfirenew.py
+++ b/sface/sfirenew.py
@@ -21,7 +21,7 @@ class SfiRenewer(QObject):
 
         self.renewProcess = SfiProcess(self)
         self.connect(self.renewProcess, SIGNAL('finished()'), self.finishedGetRecord)
-        self.renewProcess.getRecord(hrn=hrn, filename="/tmp/slicerecord")
+        self.renewProcess.getRecord(hrn=hrn, type="slice", filename="/tmp/slicerecord")
 
     def finishedGetRecord(self):
         self.faultString = self.renewProcess.getFaultString()
diff --git a/sface/sliceview.py b/sface/sliceview.py
index fe67cbd..2914c04 100644
--- a/sface/sliceview.py
+++ b/sface/sliceview.py
@@ -223,7 +223,7 @@ class SlicePickerWindow(QDialog):
         self.process = SfiProcess(self)
         self.connect(self.process, SIGNAL('finished()'), self.getUserRecordFinished)
 
-        self.process.getRecord(hrn=config.getUser(), filename=config.getUserRecordFile())
+        self.process.getRecord(hrn=config.getUser(), type="user", filename=config.getUserRecordFile())
         self.setStatus("Refreshing user record. This will take a moment...")
 
     def getUserRecordFinished(self):