Changeset 1cf8e2c for fedd/federation

Timestamp:

Mar 12, 2010 2:35:06 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

310d419

Parents:

d46b1d5

Message:

Fix bug where federation software wasn't copied and add a hack for getting
netmasks onto dragon nodes. The latter needs to be redone correctly.

File:

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

fedd/federation/emulab_access.py

@@ -1101 +1101 @@
                                         "No interface %s on element %s" % \
                                                 (ifname, e.name[0]))
+                            # XXX: do netmask right
                             if type =='link':
                                 s = ("tb-allow-external $%s dragonportal " + \
-                                        "ip %s vlan %s\n") % \
+                                        "ip %s vlan %s netmask 255.255.255.0\n") % \
                                         (e.name[0], addr, vlan)
                             elif type =='lan':
@@ -1401 +1402 @@
                 get_url(s, certfile, softdir)
 
-            # Copy local portal node software to the tempdir
-            for l, f in self.portal_software:
-                base = os.path.basename(f)
-                copy_file(f, "%s/%s" % (softdir, base))
+            # Copy local federation and portal node software to the tempdir
+            for s in (self.federation_software, self.portal_software):
+                for l, f in s:
+                    base = os.path.basename(f)
+                    copy_file(f, "%s/%s" % (softdir, base))
 
             for a in attrs: