Changeset 2c51061

Timestamp:

Jun 1, 2010 11:41:09 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

9e38ded

Parents:

1502580

Message:

Make it easier to follow compositions by using the non-numeric stems of user specified node names as the basis for names in the composed experiment.

Also added an option to output textbed commands in the ns2 output.

File:

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

fedd/compose.py

@@ -164 +164 @@
                 action='store_true',
                 help='add testbed attributes to each component')
+        self.add_option('--output_testbeds', dest='output_testbeds', 
+                default=False, action='store_true',
+                help='Output tb-set-node-testbed commands to ns2')
         self.add_option('--lax', dest='lax', default=False,
                 action='store_true',
@@ -218 +221 @@
     return n
 
+def base_name(n):
+    """
+    Extract a base name of the node to use for constructing a non-colliding
+    name.  This makes the composed topologies a little more readable.  It's a
+    single regexp, but the function name is more meaningful.
+    """
+    return re.sub('\d+$', '',n)
+
+
+
 def localize_names(top, names, marks):
     """
@@ -232 +245 @@
         s.set_attribute('localized_name', s.name)
         if s.name in names:
-            sub_map[s.name] = n = make_new_name(names, "substrate")
+            sub_map[s.name] = n = make_new_name(names, base_name(s.name))
             s.name = n
         else:
@@ -240 +253 @@
         e.set_attribute('localized_name', e.name)
         if e.name in names:
-            nn= make_new_name(names, "node")
+            nn= make_new_name(names, base_name(e.name))
             for c in marks.get(e.name, []):
                 c.name = nn
@@ -469 +482 @@
 
 
-def output_composition(top, constraints, outfile=None, format=None):
+def output_composition(top, constraints, outfile=None, format=None, 
+        output_testbeds=False):
     """
     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):
+    def xml_out(f, top, constraints, output_testbeds):
         """
         Output into topdl.  Just call the topdl output, as the constraint
@@ -488 +502 @@
         print >>f, "</component>"
 
-    def ns2_out(f, top, constraints):
+    def ns2_out(f, top, constraints, output_testbeds):
         """
         Reformat the constraint data structures into ns2 constraint comments
@@ -505 +519 @@
             if x: return "required"
             else: return "optional"
+
+        def testbed_filter(e):
+            if isinstance(e, topdl.Computer) and e.get_attribute('testbed'):
+                return 'tb-set-node-testbed ${%s} "%s"' % \
+                        (topdl.to_tcl_name(e.name), e.get_attribute('testbed'))
+            else:
+                return ""
+
+        if output_testbeds: filters = [ testbed_filter ] 
+        else: filters = [ ] 
         
         # ns2_out main line
@@ -512 +536 @@
                     required_format(c.required), ",".join(c.provides),
                     ",".join(c.accepts))
-        print >>f, topdl.topology_to_ns2(top)
+        print >>f, topdl.topology_to_ns2(top, filters=filters)
 
     # Info to map from format to output routine.  
@@ -540 +564 @@
     if outfile: f = open(outfile, "w")
     else: f = sys.stdout
-    exporter(f, top, constraints)
+    exporter(f, top, constraints, output_testbeds)
     if outfile: f.close()
 
@@ -667 +691 @@
 # 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.outfile, opts.format, opts.output_testbeds)
 
 sys.exit(0)