avoid sending a 'resources' after 'create', use the result of 'create'

[sface.git] / sface / sfiprocess.py

diff --git a/sface/sfiprocess.py b/sface/sfiprocess.py
index 34608de..108530c 100644 (file)
--- a/sface/sfiprocess.py
+++ b/sface/sfiprocess.py
@@ -103,9 +103,10 @@ class SfiProcess(QObject):
 
         return self.faults[0].get("faultString","") + " (" + self.faults[0].get("faultCode","") + ")"
 
-    def __getRSpec(self, mgr):
+    def retrieveRspec(self):
         slice = config.getSlice()
-        # Write RSpec to file for testing.
+        mgr = config.getSlicemgr()
+        # Write RSpec to file
         filename = config.fullpath ("%s.rspec"%slice)
         try:
             os.remove(filename)
@@ -119,11 +120,6 @@ class SfiProcess(QObject):
         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(),
@@ -162,14 +158,18 @@ class SfiProcess(QObject):
         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(),