Changeset 43649f1

Timestamp:

Feb 10, 2010 11:06:05 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

35aa3ae

Parents:

b4624b2

Message:

moved startcmd generation into the access controller where it belongs. About to neaten it

File:

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

fedd/federation/emulab_access.py

@@ -956 +956 @@
         t.incorporate_elements()
 
-        if master: cmdname = 'MasterConnectorStartCmd'
-        else:cmdname = 'SlaveConnectorStartCmd'
-
-        # Localize the software locations and add
+        # The startcmds for master and slave testbeds
+        if master: 
+            gate_cmd = self.attrs.get('MasterConnectorStartCmd', '/bin/true')
+            node_cmd = self.attrs.get('MasterNodeStartCmd', 'bin/true')
+        else: 
+            gate_cmd = self.attrs.get('SlaveConnectorStartCmd', '/bin/true')
+            node_cmd = self.attrs.get('SlaveNodeStartCmd', 'bin/true')
+
+        # Localize the software locations and add startcmds
         for e in t.elements:
             for s in getattr(e, 'software', []):
                 s.location = re.sub("^.*/", softdir, s.location)
-            if isinstance(e, topdl.Computer) and e.get_attribute('portal'):
-                e.set_attribute('startup', self.attrs.get(cmdname))
+            if isinstance(e, topdl.Computer):
+                if e.get_attribute('portal'):
+                    # Portals never have a user-specified start command
+                    e.set_attribute('startup', gate_cmd)
+                else:
+                    if e.get_attribute('startup'):
+                        s.set_attribute('startup', "%s \\$USER '%s'" % \
+                                (node_cmd, e.get_attribute('startup')))
+                    else:
+                        s.set_attribute('startup', node_cmd)
 
 
@@ -970 +983 @@
         filters = []
 
-        if master: cmdname = 'MasterConnectorCmd'
-        else:cmdname = 'SlaveConnectorCmd'
+        # NB: these are extra commands issued for the node, not the startcmds
+        if master: cmd = self.attrs.get('MasterConnectorCmd', '')
+        else: cmd = self.attrs.get('SlaveConnectorCmd', '')
 
         if self.attrs.has_key('dragon'):
@@ -979 +993 @@
             add_filter = None
 
-        if self.attrs.has_key(cmdname):
-            filters.append(topdl.generate_portal_command_filter(
-                self.attrs.get(cmdname), add_filter=add_filter))
+        if cmd:
+            filters.append(topdl.generate_portal_command_filter(cmd,
+                add_filter=add_filter))
 
         if self.attrs.has_key('connectorImage'):