Changeset 35aa3ae

Timestamp:

Feb 10, 2010 11:26:38 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

8139a48

Parents:

43649f1

Message:

move the startcmd into the first lop

File:

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

fedd/federation/emulab_access.py

@@ -943 +943 @@
         t = topo.clone()
 
-        # Weed out the things we aren't going to instantiate: Segments, portal
-        # substrates, and portal interfaces.  (The copy in the for loop allows
-        # us to delete from e.elements in side the for loop).
-        for e in [e for e in t.elements]:
-            if isinstance(e, topdl.Segment):
-                t.elements.remove(e)
-            if isinstance(e, topdl.Computer):
-                e.interface = [i for i in e.interface \
-                        if not i.get_attribute('portal') or \
-                            i.get_attribute('dragon_vlan')]
-        t.substrates = [ s.clone() for s in t.substrates ]
-        t.incorporate_elements()
-
         # The startcmds for master and slave testbeds
         if master: 
@@ -964 +951 @@
             node_cmd = self.attrs.get('SlaveNodeStartCmd', 'bin/true')
 
-        # Localize the software locations and add startcmds
-        for e in t.elements:
+        # Weed out the things we aren't going to instantiate: Segments, portal
+        # substrates, and portal interfaces.  (The copy in the for loop allows
+        # us to delete from e.elements in side the for loop).  While we're
+        # touching all the elements, we also adjust paths from the original
+        # testbed to local testbed paths and put the federation commands into
+        # the start commands
+        for e in [e for e in t.elements]:
+            if isinstance(e, topdl.Segment):
+                t.elements.remove(e)
+            # Fix software paths
             for s in getattr(e, 'software', []):
                 s.location = re.sub("^.*/", softdir, s.location)
             if isinstance(e, topdl.Computer):
-                if e.get_attribute('portal'):
+                if e.get_attribute('portal') and gate_cmd:
                     # Portals never have a user-specified start command
                     e.set_attribute('startup', gate_cmd)
-                else:
+                elif node_cmd:
                     if e.get_attribute('startup'):
                         s.set_attribute('startup', "%s \\$USER '%s'" % \
@@ -979 +974 @@
                         s.set_attribute('startup', node_cmd)
 
+                # Remove portal interfaces that do not connect to DRAGON
+                e.interface = [i for i in e.interface \
+                        if not i.get_attribute('portal') or \
+                            i.get_attribute('dragon_vlan')]
+
+        t.substrates = [ s.clone() for s in t.substrates ]
+        t.incorporate_elements()
 
         # Customize the ns2 output for local portal commands and images