Changeset d87778f for fedd/federation/emulab_access.py

Timestamp:

Feb 14, 2010 12:04:40 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c0a8738

Parents:

94a00cb

Message:

Some bugs that weren't shaken out. Wrong peer in the config file, active configs not marked, and startcmds not munged.

File:

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

fedd/federation/emulab_access.py

@@ -986 +986 @@
             active = info.get('active', 'False')
 
-
             cfn = "%s/%s.gw.conf" % (tmpdir, myname.lower())
             tunnelconfig = self.attrs.has_key('TunnelCfg')
@@ -992 +991 @@
                 f = open(cfn, "w")
                 if active == 'True':
+                    print >>f, "active: True"
                     if type in ('control', 'both'):
                         for s in [s for s in services \
@@ -1102 +1102 @@
                 elif node_cmd:
                     if e.get_attribute('startup'):
-                        s.set_attribute('startup', "%s \\$USER '%s'" % \
+                        e.set_attribute('startup', "%s \\$USER '%s'" % \
                                 (node_cmd, e.get_attribute('startup')))
                     else:
-                        s.set_attribute('startup', node_cmd)
+                        e.set_attribute('startup', node_cmd)
 
                 # Remove portal interfaces that do not connect to DRAGON