Changeset 175b444 for fedd/federation/experiment_control.py

Timestamp:

May 10, 2010 2:20:40 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

10a7053

Parents:

e77c86e

Message:

Add a new plugin for the DETER internal network, and generalize the dragon partition code to accept different networks.

File:

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

fedd/federation/experiment_control.py

@@ -270 +270 @@
         self.ssh_privkey_file = config.get("experiment_control",
                 "ssh_privkey_file")
+        dt = config.get("experiment_control", "direct_transit")
+        self.direct_transit = [ tb.strip() for tb in dt.split(",")]
         # NB for internal master/slave ops, not experiment setup
         self.ssh_type = config.get("experiment_control", "sshkeytype", "rsa")
@@ -1132 +1134 @@
             if suffix:
                 tb_attrs.append({'attribute': 'experiment_name', 
-                    'value': "%s_%s" % (eid, suffix)})
+                    'value': "%s-%s" % (eid, suffix)})
             else:
                 tb_attrs.append({'attribute': 'experiment_name', 'value': eid})
@@ -1764 +1766 @@
 
             part = experiment_partition(self.auth, self.store_url, self.tbmap,
-                    self.muxmax)
+                    self.muxmax, self.direct_transit)
             part.add_portals(top, topo, eid, masters, tbparams, ip_allocator,
                     connInfo, expid)