Changeset 4ed10ae for fedd/fedd_experiment_control.py

Timestamp:

Nov 14, 2008 5:13:10 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:

afa43a8

Parents:

2dafa0c

Message:

Proxy key additions working

File:

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

fedd/fedd_experiment_control.py

@@ -320 +320 @@
         except pickle.PicklingError, e:
             self.log.error("Pickling problem: %s" % e)
+        except TypeError, e:
+            self.log.error("Pickling problem (TypeError): %s" % e)
 
     # Call while holding self.state_lock
@@ -441 +443 @@
             self.log.error("[start_segment]: can't open /dev/null: %s" %e)
 
-        status = Popen(cmd, stdout=PIPE, stderr=dev_null)
-        for line in status.stdout:
-            m = state_re.match(line)
-            if m: state = m.group(1)
-            else:
-                m = no_exp_re.match(line)
-                if m: state = "none"
-        rv = status.wait()
+        if self.debug:
+            state = 'swapped'
+            rv = 0
+        else:
+            status = Popen(cmd, stdout=PIPE, stderr=dev_null)
+            for line in status.stdout:
+                m = state_re.match(line)
+                if m: state = m.group(1)
+                else:
+                    m = no_exp_re.match(line)
+                    if m: state = "none"
+            rv = status.wait()
 
         # If the experiment is not present the subcommand returns a non-zero
@@ -766 +772 @@
         else: return None
 
-
     def get_access(self, tb, nodes, user, tbparam):
         """
@@ -835 +840 @@
         except ZSI.ParseException, e:
             raise service_error(service_error.req,
-                    "Bad format message (XMLRPC??): %s" %
-                    str(e))
-        r = unpack_soap(resp)
+                    "Bad format message (XMLRPC??): %s" % str(e))
+        except ZSI.FaultException, e:
+            resp = e.fault.detail[0]
+
+        # Again, weird incompatibilities rear their head.  userRoles, which are
+        # restricted strings, seem to be encoded by ZSI as non-unicode strings
+        # in a way that confuses the pickling and XMLRPC sending systems.
+        # Explicitly unicoding them seems to fix this, though it concerns me
+        # some.  It may be that these things are actually a ZSI string
+        # subclass, and the character encoding is not the major issue.  In any
+        # case, making all the subclasses of basestring into unicode strings
+        # unifies the response format and solves the problem.
+        r = make_unicode(unpack_soap(resp))
 
         if r.has_key('RequestAccessResponseBody'):
@@ -844 +859 @@
             raise service_error(service_error.proxy,
                     "Bad proxy response")
-
 
         e = r['emulab']
@@ -868 +882 @@
                 if key:
                     tbparam[tb][key]= a['value']
-
+        
     def remote_splitter(self, uri, desc, master):