Changeset 4d68ba6

Timestamp:

Apr 13, 2012 3:10:58 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

66795cf0

Parents:

c0f409a

Message:

Do not add a startcommand to non-federated experiments

File:

• fedd/federation/emulab_access.py (modified) (4 diffs)

fedd/federation/emulab_access.py

@@ -408 +408 @@
                 return e.name not in self.nodes
 
+        def have_portals(top):
+            '''
+            Return true if the topology has a portal node
+            '''
+            # The else is on the for
+            for e in top.elements:
+                if isinstance(e, topdl.Computer) and e.get_attribute('portal'):
+                    return True
+            else:
+                return False
+
+
         # Main line of generate_ns2
         t = topo.clone()
@@ -443 +455 @@
         # testbed to local testbed paths and put the federation commands into
         # the start commands
+        local = len(dragon_map) == 0 and not have_portals(t)
+        if local: routing = 'Static'
+        else: routing = 'Manual'
+
+        self.log.debug("Local: %s", local)
         for e in [e for e in t.elements]:
             if isinstance(e, topdl.Segment):
@@ -453 +470 @@
                     # Portals never have a user-specified start command
                     e.set_attribute('startup', self.portal_startcommand)
-                elif self.node_startcommand:
+                elif not local and self.node_startcommand:
                     if e.get_attribute('startup'):
                         e.set_attribute('startup', "%s \\$USER '%s'" % \
@@ -494 +511 @@
 
         # Convert to ns and write it out
-        expfile = topdl.topology_to_ns2(t, filters)
+        expfile = topdl.topology_to_ns2(t, filters, routing=routing)
         try:
             f = open(expfn, "w")