Changeset 3925b50 for fedd/fedd_experiment_control.py

Timestamp:

Oct 15, 2008 4:50:48 PM (16 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:

abb87eb

Parents:

d199ced

Message:

add placeholder for other experiment descriptions

File:

• fedd/fedd_experiment_control.py (modified) (1 diff)

fedd/fedd_experiment_control.py

@@ -1346 +1346 @@
                     "Bad request format (no CreateRequestBody)")
         # The tcl parser needs to read a file so put the content into that file
-        file_content=req.get('experimentdescription', None)
-        if file_content:
-            try:
-                f = open(tclfile, 'w')
-                f.write(file_content)
-                f.close()
-            except IOError:
-                raise service_error(service_error.internal,
-                        "Cannot write temp experiment description")
+        descr=req.get('experimentdescription', None)
+        if descr:
+            file_content=descr.get('ns2description', None)
+            if file_content:
+                try:
+                    f = open(tclfile, 'w')
+                    f.write(file_content)
+                    f.close()
+                except IOError:
+                    raise service_error(service_error.internal,
+                            "Cannot write temp experiment description")
+            else:
+                raise service_error(service_error.req, 
+                        "Only ns2descriptions supported")
         else:
             raise service_error(service_error.req, "No experiment description")