Changeset 1dcaff4 for fedd/federation/experiment_control.py

Timestamp:

Mar 18, 2010 8:35:10 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

114d24b

Parents:

3159f5d

Message:

Improved SSL error handling (more try blocks, BIOError exception)
Separate get_url into util
Work with remote splitter.

File:

• fedd/federation/experiment_control.py (modified) (3 diffs)

fedd/federation/experiment_control.py

@@ -936 +936 @@
         if r.has_key('Ns2SplitResponseBody'):
             r = r['Ns2SplitResponseBody']
-            if r.has_key('output'):
-                return r['output'].splitlines()
+            ed = r.get('experimentdescription', None)
+            if ed.has_key('topdldescription'):
+                return topdl.Topology(**ed['topdldescription'])
             else:
                 raise service_error(service_error.protocol, 
@@ -2116 +2117 @@
                 self.log.debug("Calling remote splitter at %s" % \
                         self.splitter_url)
-                split_data = self.remote_splitter(self.splitter_url,
+                top = self.remote_splitter(self.splitter_url,
                         file_content, master)
             else:
@@ -2133 +2134 @@
                 split_data = tclparser.stdout
 
-            top = topdl.topology_from_xml(file=split_data, top="experiment")
+                top = topdl.topology_from_xml(file=split_data, top="experiment")
 
             hosts, ip_allocator = self.allocate_ips_to_topo(top)