Changeset 3159f5d

Timestamp:

Mar 17, 2010 2:27:33 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

1dcaff4

Parents:

76441b6

Message:

Set up the repote splitter to translate into a topdl description. It has thus
become misnamed.

Location:

fedd

Files:

• fedd_client.py (modified) (2 diffs)
• federation/split.py (modified) (4 diffs)

fedd/fedd_client.py

@@ -1511 +1511 @@
         if os.access(cert, os.R_OK):
             fid = fedid(file=cert)
-            if opts.use_fedid == True:
-                user = fid
         else:
             sys.exit("Cannot read certificate (%s)" % cert)
@@ -1556 +1554 @@
         if opts.debug > 1: print >>sys.stderr, resp_dict
 
-        out = resp_dict.get('output', None)
-
-        for line in out.splitlines():
-            print "%s" % line
+        ed = resp_dict.get('experimentdescription', None)
+        if ed:
+            if ed.has_key('topdldescription'):
+                topo = topdl.Topology(**ed['topdldescription'])
+                print topdl.topology_to_xml(topo, 'experiment')
 
 class access(fedd_rpc):

fedd/federation/split.py

@@ -5 +5 @@
 import tempfile
 import logging
+import topdl
 
 from util import *
@@ -128 +129 @@
         
         
-        tclcmd = [self.tclsh, self.tcl_splitter, '-s', '-x', 
+        tclcmd = [self.tclsh, self.tcl_splitter, '-t', '-x', 
             str(self.muxmax), '-m', master]
         if include_fedkit: tclcmd.append('-k')
@@ -135 +136 @@
         tclparser = subprocess.Popen(tclcmd, stdout=subprocess.PIPE)
 
-        out = ""
-        # Package up the split data
-        for line in tclparser.stdout:
-            out += line
+        top = topdl.topology_from_xml(file=tclparser.stdout, top="experiment")
 
         # Walk up tmpdir, deleting as we go
@@ -148 +146 @@
         os.rmdir(tmpdir)
 
-        resp = { 'output' : out }
+        resp = { 
+                'experimentdescription':  { 
+                    'topdldescription': top.to_dict(),
+                    }
+                }
 
         return resp