Changeset fd556d1 for fedd/federation/access.py

Timestamp:

Sep 6, 2009 3:11:36 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

e19b75c

Parents:

2b7d768

Message:

Properly communicate errors

File:

• fedd/federation/access.py (modified) (2 diffs)

fedd/federation/access.py

@@ -1353 +1353 @@
         self.generate_ns2(topo, expfile, 
                 "/proj/%s/software/%s/" % (proj, ename), master)
-        starter = self.start_segment(keyfile=self.ssh_privkey_file, debug=self.create_debug)
-        starter(self, ename, proj, user, expfile, tmpdir)
-
-        return { 'allocID': req['allocID'] }
+        starter = self.start_segment(keyfile=self.ssh_privkey_file, 
+                debug=self.create_debug)
+        rv = starter(self, ename, proj, user, expfile, tmpdir)
+        if rv:
+            return { 'allocID': req['allocID'] }
+        else:
+            raise service_error(service_error.federant, "Swapin failed")
 
     def TerminateSegment(self, req, fid):
@@ -1392 +1395 @@
             raise service_error(service_error.internal, 
                     "Can't find experiment name for %s" % aid)
-        stopper = self.stop_segment(keyfile=self.ssh_privkey_file, debug=self.create_debug)
+        stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
+                debug=self.create_debug)
         stopper(self, user, proj, ename)
-        print { 'allocID': req['allocID'] }
         return { 'allocID': req['allocID'] }