Changeset a7c0bcb for fedd/federation

Timestamp:

Dec 6, 2010 5:51:09 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

ac15159, c179764, cd60510

Parents:

35a5879

Message:

Allow users to pass topdl to fedd_create.py. fedd_create autodetects and composes the proper message. The experiment controller now just takes the topology as given.

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -1558 +1558 @@
         descr=req.get('experimentdescription', None)
         if descr:
-            file_content=descr.get('ns2description', None)
+            if 'ns2description' in descr:
+                file_content=descr['ns2description']
+            elif 'topdldescription' in descr:
+                return topdl.Topology(**descr['topdldescription'])
+            else:
+                raise service_error(service_error.req, 
+                        'Unknown experiment description type')
         else:
             raise service_error(service_error.req, "No experiment description")