Ignore:
Timestamp:
Oct 7, 2011 5:30:13 PM (13 years ago)
Author:
Ted Faber <faber@…>
Branches:
compt_changes, info-ops, master
Children:
451fb96
Parents:
05c41f5 (diff), 1fed67b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of git://fedd.deterlab.net/fedd

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/emulab_segment.py

    r1fed67b r58e5a4f  
    156156        return code == 0
    157157
     158    def terminate_exp(self, pid, eid, wait=True):
     159        """
     160        Completely terminate experiment
     161        """
     162        if self.debug:
     163            if self.log:
     164                self.log.info("[swap_exp]: (debug) terminate %s" %  eid)
     165            return True
     166        else:
     167            if self.log:
     168                self.log.info("[swap_exp]: Terminating %s" % (eid)
     169            params = {
     170                    'proj': pid,
     171                    'exp': eid,
     172                    'wait': wait,
     173                    }
     174            code, value = self.emulab_call('experiment.endexp', params)
     175
     176            if self.log:
     177                if code == 0: self.log.info('[swap_exp]: Terminate succeeded')
     178                else: self.log.error('[swap_exp]: Terminate failed: %s' % value)
     179
     180        return code == 0
     181
    158182    def modify_exp(self, pid, eid, tcl, wait=True):
    159183        if self.debug:
Note: See TracChangeset for help on using the changeset viewer.