Changeset 696a689 for fedd/federation

Timestamp:

Dec 3, 2010 1:53:34 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

6fd2b29

Parents:

a6a3f93

Message:

Fail gracefully on a failed swapin. I think this

fixes #6

File:

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

fedd/federation/experiment_control.py

@@ -1222 +1222 @@
                             target=self.terminate_segment(log=log,
                                 testbed=tb,
-                                cert_file=self.cert_file, 
-                                cert_pwd=self.cert_pwd,
+                                cert_file=cert, 
+                                cert_pwd=pw,
                                 trusted_certs=self.trusted_certs,
                                 caller=self.call_TerminateSegment),
@@ -1238 +1238 @@
                     try:
                         self.release_access(tb, tbparams[tb]['allocID'], 
-                                tbmap=tbmap, uri=tbparams[tb].get('uri', None))
+                                tbmap=tbmap, uri=tbparams[tb].get('uri', None),
+                                cert_file=cert, cert_pwd=pw)
                     except service_error, e:
                         self.log.warn("Error releasing access: %s" % e.desc)