Changeset f9ef40b for fedd/federation/experiment_control.py

Timestamp:

Sep 2, 2009 5:59:16 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:

9beaf7c

Parents:

6c57fe9

Message:

checkpoint: writing config files

File:

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

fedd/federation/experiment_control.py

@@ -2161 +2161 @@
                 req['fedAttr'] = attrs
 
+            print req
             r = self.caller(uri, req, self.cert_file, self.cert_pwd,
                     self.trusted_certs)
@@ -2230 +2231 @@
                     trusted_certs=self.trusted_certs,
                     caller=self.call_StartSegment)
-            if not starter(uri, aid, topo[master]):
+            if not starter(uri, aid, topo[master], attrs):
                 failed.append(master)
 
@@ -2613 +2614 @@
                         sproject = tbparams[st].get('project', 'project')
                         dproject = tbparams[dt].get('project', 'project')
-                        sdomain = ".%s.%s%s" % (eid, sproject,
-                                tbparams[st].get('domain', ".example.com"))
-                        ddomain = ".%s.%s%s" % (eid, dproject,
-                                tbparams[dt].get('domain', ".example.com"))
-                        mdomain = "%s.%s%s" % (eid, 
-                                tbparams[master].get('project', 'project'),
-                                tbparams[master].get('domain', '.example.com'))
+                        mproject = tbparams[master].get('project', 'project')
+                        sdomain = tbparams[st].get('domain', ".example.com")
+                        ddomain = tbparams[dt].get('domain', ".example.com")
+                        mdomain = tbparams[master].get('domain', '.example.com')
                         # XXX: active and type need to be unkludged
                         active = ("%s" % (st == master))
@@ -2626 +2624 @@
                             # testbed in there.
                             tsubstrate = \
-                                    topdl.Substrate(name='%s-%s' % (st, dt))
+                                    topdl.Substrate(name='%s-%s' % (st, dt),
+                                            attribute= [
+                                                topdl.Attribute(
+                                                    attribute='portal',
+                                                    value='true')
+                                                ]
+                                            )
                             segment_element = topdl.Segment(
                                     id= tbparams[dt]['allocID'],
@@ -2652 +2656 @@
                                         for n, v in (\
                                             ('portal', 'true'),
+                                            ('domain', sdomain),
                                             ('masterdomain', mdomain),
+                                            ('masterexperiment', "%s/%s" % \
+                                                    (mproject, eid)),
                                             ('experiment', "%s/%s" % \
                                                     (sproject, eid)),
-                                            ('peer', "%s.%s" % \
-                                                    (desthost, ddomain)),
+                                            ('peer', "%s" % desthost),
+                                            ('peer_segment', "%s" % \
+                                                    tbparams[dt]['allocID']['fedid']),
                                             ('scriptdir', 
                                                 "/usr/local/federation/bin"),
@@ -2674 +2682 @@
                                     topdl.Interface(
                                         substrate=\
-                                            segment_substrate[st][dt].name
+                                            segment_substrate[st][dt].name,
+                                        attribute=[
+                                            topdl.Attribute(attribute='portal',
+                                                value='true')
+                                            ]
                                         ),
                                     ],