Changeset 743a102 for fedd

Timestamp:

Oct 7, 2011 3:29:01 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

05c41f5, 1fed67b

Parents:

95be336

Message:

Keep SERVICE comment lines in composed file. Closes #28

File:

• fedd/compose.py (modified) (12 diffs)

fedd/compose.py

@@ -403 +403 @@
     top.incorporate_elements()
 
+def import_ns2_services(contents):
+    """
+    Contents is a list containing the lines of an annotated ns2 file.  This
+    routine extracts the service comment lines and puts them into an array for
+    output later if the output format is tcl.
+
+    Services are given in lines of the form
+        # SERVICE:name:exporter:importers:attributes
+
+    See http://fedd.deterlab.net/wiki/FeddAbout#ExperimentServices
+    """
+
+    service_re = re.compile("\s*#\s*SERVICE.*")
+    services = [ ]
+    for l in contents:
+        m = service_re.search(l)
+        if m: services.append(l)
+
+    return services
+
+
+
 def import_ns2_constraints(contents):
     """
@@ -450 +472 @@
 
     marks = import_ns2_constraints(contents)
+    services = import_ns2_services(contents)
     top = remote_ns2topdl(opts.url, "".join(contents), cert)
     if not top:
         raise RuntimeError("Cannot create topology from: %s" % fn)
 
-    return (top, marks)
+    return (top, marks, services)
 
 def import_xml_component(fn):
@@ -461 +484 @@
     """
     return (topdl.topology_from_xml(filename=fn, top='experiment'), 
-            constraints_from_xml(filename=fn, top='constraints'))
+            constraints_from_xml(filename=fn, top='constraints'), [])
 
 def index_constraints(constraints, provides, accepts, names):
@@ -487 +510 @@
 
 def output_composition(top, constraints, outfile=None, format=None, 
-        output_testbeds=False):
+        output_testbeds=False, services=None):
     """
     Output the composition to the file named by outfile (if any) in the format
     given by format if any.  If both are None, output to stdout in topdl
     """
-    def xml_out(f, top, constraints, output_testbeds):
+    def xml_out(f, top, constraints, output_testbeds, services):
         """
         Output into topdl.  Just call the topdl output, as the constraint
@@ -506 +529 @@
         print >>f, "</component>"
 
-    def ns2_out(f, top, constraints, output_testbeds):
+    def ns2_out(f, top, constraints, output_testbeds, services):
         """
         Reformat the constraint data structures into ns2 constraint comments
@@ -540 +563 @@
                     required_format(c.required), ",".join(c.provides),
                     ",".join(c.accepts))
+        for s in services:
+            print >>f, s
         print >>f, topdl.topology_to_ns2(top, filters=filters)
 
@@ -568 +593 @@
     if outfile: f = open(outfile, "w")
     else: f = sys.stdout
-    exporter(f, top, constraints, output_testbeds)
+    exporter(f, top, constraints, output_testbeds, services)
     if outfile: f.close()
 
@@ -594 +619 @@
     components = 0
     topos = [ ]
+    services = [ ]
 
     for fn, cnt in files:
@@ -599 +625 @@
             s = get_suffix(fn)
             if s and s in importers:
-                top, cons = importers[s](fn)
+                top, cons, svcs = importers[s](fn)
             else:
                 warn("Unknown suffix on file %s.  Ignored" % fn)
@@ -624 +650 @@
             localize_names(t, names, marks)
             constraints.extend(c)
+            services.extend(svcs)
             topos.append(t)
 
-    return (components, topos, names, constraints, provides, accepts)
+    return (components, topos, names, constraints, provides, accepts, services)
 
 def parse_config(fn, opts):
@@ -747 +774 @@
 
 # Pull 'em in.
-components, topos, names, constraints, provides, accepts = \
+components, topos, names, constraints, provides, accepts, services = \
         import_components(files)
 
@@ -796 +823 @@
 # Put out the composition with only the unmatched constraints
 output_composition(comp, [c for c in constraints if not c.match], 
-        opts.outfile, opts.format, opts.output_testbeds)
+        opts.outfile, opts.format, opts.output_testbeds, services)
 
 sys.exit(0)