Changeset fe6e0be for fedd


Ignore:
Timestamp:
Feb 29, 2012 2:03:09 PM (8 years ago)
Author:
Ted Faber <faber@…>
Branches:
compt_changes, master
Children:
a11eda5
Parents:
a69de97 (diff), 3b1c6da (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 tardis.deterlab.net:/var/local/git/fedd

Location:
fedd
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • fedd/deter/topdl.py

    ra69de97 rfe6e0be  
    465465    def to_xml(self):
    466466        if self.uuid: rv = "<uuid>%s</uuid>" % b64encode(self.uuid)
    467         elif self.fedid: rv = "<fedid>%s</fedid>" % b64encode(self.fedid)
     467        elif self.fedid: rv = "<fedid>%s</fedid>" % \
     468                b64encode(self.fedid.get_bits())
    468469        elif self.uri: rv = "<uri>%s</uri>" % escape(self.uri)
    469470        elif self.localname:
     
    671672    def to_xml(self):
    672673        rv = "<id>%s</id><uri>%s</uri><type>%s</type>" % \
    673                 (id.to_xml(), escape(self.uri), escape(self.type))
     674                (self.id.to_xml(), escape(self.uri), escape(self.type))
    674675        if self.interface:
    675676            rv += join(["<interface>%s</interface>" % i.to_xml()
  • fedd/federation/experiment_control.py

    r3b1c6da rfe6e0be  
    902902                    'allocID': {'fedid': aid },
    903903                }
     904            self.log.info("Calling terminate segment")
    904905            try:
    905906                r = self.caller(uri, req, self.cert_file, self.cert_pwd,
    906907                        self.trusted_certs)
     908                self.log.info("Terminate segment succeeded")
    907909                return True
    908910            except service_error, e:
     
    26822684        # log file.
    26832685        dealloc_log = logging.getLogger('fedd.experiment_control.%s' % key)
     2686        dealloc_log.info("Terminating %s " %key)
    26842687        h = logging.StreamHandler(self.list_log(dealloc_list))
    26852688        # XXX: there should be a global one of these rather than repeating the
Note: See TracChangeset for help on using the changeset viewer.