Changeset ecca6eb for fedd/federation/experiment_control.py

Timestamp:

Sep 3, 2009 6:51:50 PM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

f5ae004

Parents:

66861a2

Message:

checkpoint

File:

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

fedd/federation/experiment_control.py

@@ -2151 +2151 @@
             self.caller = caller
 
-        def __call__(self, uri, aid, topo, attrs=None):
+        def __call__(self, uri, aid, topo, master, attrs=None):
             req = {
                     'allocID': { 'fedid' : aid }, 
@@ -2157 +2157 @@
                         'topdldescription': topo.to_dict(),
                     },
+                    'master': master,
                 }
             if attrs:
@@ -2204 +2205 @@
                         trusted_certs=self.trusted_certs,
                         caller=self.call_StartSegment), 
-                    args=(uri, aid, topo[tb], attrs), name=tb,
+                    args=(uri, aid, topo[tb], False, attrs), name=tb,
                     pdata=thread_pool, trace_file=self.trace_file)
             threads.append(t)
@@ -2231 +2232 @@
                     trusted_certs=self.trusted_certs,
                     caller=self.call_StartSegment)
-            if not starter(uri, aid, topo[master], attrs):
+            if not starter(uri, aid, topo[master], True, attrs):
                 failed.append(master)
 
@@ -2668 +2669 @@
                                                 "/usr/local/federation/bin"),
                                             ('active', "%s" % active),
-                                            ('type', 'both'), 
-                                            ('startup', 'sudo -H /usr/local/federation/bin/fed-tun.pl -f /proj/%s/exp/%s/tmp/%s%s.gw.conf >& /tmp/bridge.log' % (sproject, eid, myname.lower(), sdomain.lower())))
+                                            ('portal_type', 'both'), 
+                                            ('startup', 'sudo -H /usr/local/federation/bin/fed-tun.pl -f /proj/%s/exp/%s/tmp/%s.%s.%s%s.gw.conf >& /tmp/bridge.log' % (sproject, eid, myname.lower(), eid.lower(), sproject.lower(), sdomain.lower())))
                                     ],
                                 interface=[
@@ -2836 +2837 @@
                             (url_base, expid)
                 },
+                {
+                    'attribute': 'experiment_name',
+                    'value': eid,
+                },
             ]