Changeset fe6e0be

Timestamp:

Feb 29, 2012 2:03:09 PM (13 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:

• deter/topdl.py (modified) (2 diffs)
• federation/experiment_control.py (modified) (2 diffs)

fedd/deter/topdl.py

@@ -465 +465 @@
     def to_xml(self):
         if self.uuid: rv = "<uuid>%s</uuid>" % b64encode(self.uuid)
-        elif self.fedid: rv = "<fedid>%s</fedid>" % b64encode(self.fedid)
+        elif self.fedid: rv = "<fedid>%s</fedid>" % \
+                b64encode(self.fedid.get_bits())
         elif self.uri: rv = "<uri>%s</uri>" % escape(self.uri)
         elif self.localname: 
@@ -671 +672 @@
     def to_xml(self):
         rv = "<id>%s</id><uri>%s</uri><type>%s</type>" % \
-                (id.to_xml(), escape(self.uri), escape(self.type))
+                (self.id.to_xml(), escape(self.uri), escape(self.type))
         if self.interface:
             rv += join(["<interface>%s</interface>" % i.to_xml() 

fedd/federation/experiment_control.py

@@ -902 +902 @@
                     'allocID': {'fedid': aid }, 
                 }
+            self.log.info("Calling terminate segment")
             try:
                 r = self.caller(uri, req, self.cert_file, self.cert_pwd,
                         self.trusted_certs)
+                self.log.info("Terminate segment succeeded")
                 return True
             except service_error, e:
@@ -2682 +2684 @@
         # log file.
         dealloc_log = logging.getLogger('fedd.experiment_control.%s' % key)
+        dealloc_log.info("Terminating %s " %key)
         h = logging.StreamHandler(self.list_log(dealloc_list))
         # XXX: there should be a global one of these rather than repeating the