Changeset 696a689 for fedd/federation


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/experiment_control.py

    ra6a3f93 r696a689  
    12221222                            target=self.terminate_segment(log=log,
    12231223                                testbed=tb,
    1224                                 cert_file=self.cert_file,
    1225                                 cert_pwd=self.cert_pwd,
     1224                                cert_file=cert,
     1225                                cert_pwd=pw,
    12261226                                trusted_certs=self.trusted_certs,
    12271227                                caller=self.call_TerminateSegment),
     
    12381238                    try:
    12391239                        self.release_access(tb, tbparams[tb]['allocID'],
    1240                                 tbmap=tbmap, uri=tbparams[tb].get('uri', None))
     1240                                tbmap=tbmap, uri=tbparams[tb].get('uri', None),
     1241                                cert_file=cert, cert_pwd=pw)
    12411242                    except service_error, e:
    12421243                        self.log.warn("Error releasing access: %s" % e.desc)
Note: See TracChangeset for help on using the changeset viewer.