Changeset e07c8f3 for fedd/federation/emulab_access.py

Timestamp:

Jun 1, 2010 8:02:00 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

1502580

Parents:

5767b20

Message:

Remove software, etc when experiment swaps out

Fix a couple small bugs in access controller that I believed were fixed before.

File:

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

fedd/federation/emulab_access.py

@@ -612 +612 @@
                                         "dragonportal ip %s vlan %s " + \
                                         "netmask 255.255.255.0\n") % \
-                                        (e.name, addr, vlan)
+                                        (topdl.to_tcl_name(e.name), addr, vlan)
                             elif type =='lan':
                                 s = ("tb-allow-external ${%s} " + \
                                         "dragonportal " + \
                                         "ip %s vlan %s usurp %s\n") % \
-                                        (e.name, addr, vlan, subs)
+                                        (topdl.to_tcl_name(e.name), addr, 
+                                                vlan, subs)
                             else:
                                 raise service_error(service_error_internal,
@@ -824 +825 @@
         # If this is the seer master, add that node, too.
         if seer_master:
-            self.add_seer_node(topo, 'seer-master', self.seer_master_start)
+            self.add_seer_node(topo, 'seer-master', 
+                    "%s -R -n -R seer-master -R -A -R sink" % \
+                            self.seer_master_start)
 
     def retrieve_software(self, topo, certfile, softdir):