Changeset f8582c9 for fedd/fedd_experiment_control.py

Timestamp:

Nov 18, 2008 8:32:05 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

dab4d56

Parents:

fd729b9

Message:

Resource allocation and deallocation really working
Access handler selects allocation ID
Fedid allocation IDs work
Revamp of util code for maodifying messages (e.g. binaries)
Handlers now see fedids as objects in messages
Fedid bug in handlers in fedd_util

This should have been multiple commits

File:

• fedd/fedd_experiment_control.py (modified) (8 diffs)

fedd/fedd_experiment_control.py

@@ -852 +852 @@
         # case, making all the subclasses of basestring into unicode strings
         # unifies the response format and solves the problem.
-        r = make_unicode(unpack_soap(resp))
+        r = make_unicode(fedids_to_obj(unpack_soap(resp)))
 
         if r.has_key('RequestAccessResponseBody'):
@@ -896 +896 @@
         # The basic request
         req = { 'allocID' : aid }
-        
+
         # No retry loop here.  Proxy servers must correctly authenticate
         # themselves without help
-
         try:
             ctx = fedd_ssl_context(self.cert_file, 
@@ -926 +925 @@
 
         # better error coding
-
-
 
     def remote_splitter(self, uri, desc, master):
@@ -1644 +1641 @@
         os.rmdir(tmpdir)
 
-        resp = { 'federant' : [ tbparams[tb]['federant'] \
+        # The deepcopy prevents the allocation ID and other binaries from being
+        # translated into other formats
+        resp = { 'federant' : [ copy.deepcopy(tbparams[tb]['federant']) \
                 for tb in tbparams.keys() \
                     if tbparams[tb].has_key('federant') ],\
@@ -1691 +1690 @@
         if exp:
             if exp.has_key('fedid'):
-                key = fedid(bits=exp['fedid'])
+                key = exp['fedid']
                 keytype = "fedid"
             elif exp.has_key('localname'):
@@ -1724 +1723 @@
         if exp:
             if exp.has_key('fedid'):
-                key = fedid(bits=exp['fedid'])
+                key = exp['fedid']
                 keytype = "fedid"
             elif exp.has_key('localname'):
@@ -1757 +1756 @@
         if exp:
             if exp.has_key('fedid'):
-                key = fedid(bits=exp['fedid'])
+                key = exp['fedid']
                 keytype = "fedid"
             elif exp.has_key('localname'):
@@ -1792 +1791 @@
         if exp:
             if exp.has_key('fedid'):
-                key = fedid(bits=exp['fedid'])
+                key = exp['fedid']
                 keytype = "fedid"
             elif exp.has_key('localname'):