Changeset a7c0bcb

Timestamp:

Dec 6, 2010 5:51:09 PM (13 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.

Location:

fedd

Files:

• fedd_create.py (modified) (4 diffs)
• federation/experiment_control.py (modified) (1 diff)

fedd/fedd_create.py

@@ -15 +15 @@
         get_abac_certs
 from federation.util import abac_split_cert, abac_context_to_creds
+from federation import topdl
+
+from xml.parsers.expat import ExpatError
 
 class fedd_create_opts(client_opts):
@@ -154 +157 @@
 
 if opts.file:
+
+    top = None
+    # Try the file as a topdl description
     try:
-        lines = [ line for line in open(opts.file, 'r')]
-        exp_desc = "".join(lines)
+        top = topdl.topology_from_xml(filename=opts.file, top='experiment')
     except EnvironmentError:
+        # Can't read the file, fail now
         sys.exit("Cannot read description file (%s)" %opts.file)
+    except ExpatError:
+        # The file is not topdl, fall and assume it's ns2
+        pass
+
+    if top is None:
+        try:
+            lines = [ line for line in open(opts.file, 'r')]
+            exp_desc = "".join(lines)
+            # Parse all the strings that we can pull out of the file using the
+            # service_re.
+            svcs.extend([parse_service(service_re.match(l).group(1)) \
+                    for l in lines if service_re.match(l)])
+        except EnvironmentError:
+            sys.exit("Cannot read description file (%s)" %opts.file)
 else:
     sys.exit("Must specify an experiment description (--file)")
@@ -183 +203 @@
     svcs.append(project_export_service(opts.master, opts.project))
 svcs.extend([ parse_service(s) for s in opts.service])
-
-# Parse all the strings that we can pull out of the file using the service_re.
-svcs.extend([parse_service(service_re.match(l).group(1)) \
-        for l in lines if service_re.match(l)])
 
 # Create a testbed map if one is specified
@@ -253 +269 @@
 
 # Construct the Create message
-msg = { 'experimentdescription': { 'ns2description': exp_desc }, }
+if top: 
+    msg = { 'experimentdescription' : { 'topdldescription': top.to_dict() }, }
+else: 
+    msg = { 'experimentdescription': { 'ns2description': exp_desc }, }
 
 if svcs:

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")