Changeset 8cb269a for fedd/federation

Timestamp:

Oct 13, 2011 2:48:24 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

0dc62df

Parents:

c167378

Message:

Send the ns pasring error back to the caller (and back to the user)
closes #40

File:

• fedd/federation/ns2topdl.py (modified) (4 diffs)

fedd/federation/ns2topdl.py

@@ -6 +6 @@
 import logging
 import topdl
+
+import os.path
 
 from util import *
@@ -105 +107 @@
             raise service_error(service_error.internal, "Cannot create tmp dir")
 
-        tclfile = tmpdir + "/experiment.tcl"
+        tclfile = os.path.join(tmpdir, "experiment.tcl")
+        # save error output in case the parse fails.
+        errfile = os.path.join(tmpdir, "errfile")
         pid = "dummy"
         gid = "dummy"
@@ -124 +128 @@
                     f.write(file_content)
                     f.close()
+                    ef = open(errfile, 'w')
                 except EnvironmentError:
                     raise service_error(service_error.internal,
@@ -138 +143 @@
         tclcmd.extend([pid, gid, eid, tclfile])
         self.log.debug("Calling splitter %s" % " ".join(tclcmd))
-        tclparser = subprocess.Popen(tclcmd, stdout=subprocess.PIPE)
+        tclparser = subprocess.Popen(tclcmd, stdout=subprocess.PIPE, stderr=ef)
 
-        top = topdl.topology_from_xml(file=tclparser.stdout, top="experiment")
+        try:
+            top = topdl.topology_from_xml(file=tclparser.stdout, 
+                    top="experiment")
+        except:
+            top = None
+
+        if top is None:
+            # There was an ns parsing error, gather up the error from the
+            # errfile and raise a service_error containing the error text
+            try:
+                ef = open(errfile, 'r')
+                parse_err = ef.read()
+                ef.close()
+            except EnvironmentError:
+                raise service_error(service_error.internal,
+                        "Cannot read error string")
+
+            raise service_error(service_error.req, 
+                    "Cannot parse ns file: %s" % parse_err)
 
         # Walk up tmpdir, deleting as we go