Changeset f9ef40b for fedd/federation

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

Location:

fedd/federation

Files:

• access.py (modified) (3 diffs)
• experiment_control.py (modified) (6 diffs)

fedd/federation/access.py

@@ -1136 +1136 @@
             return rv
 
+    def generate_portal_configs(self, topo, pubkey_base, secretkey_base, 
+            tmpdir):
+        for p in [ e for e in topo.elements \
+                if isinstance(e, topdl.Computer) and e.get_attribute('portal')]:
+            myname = e.name[0]
+            peer = e.get_attribute('peer')
+            lexp = e.get_attribute('experiment')
+            lproj, leid = lexp.split('/', 1)
+            ldomain = e.get_attribute('domain')
+            scriptdir = e.get_attribute('scriptdir')
+            active = e.get_attribute('active')
+            type = e.get_attribute('type')
+            segid = fedid(hexstr=e.get_attribute('peer_segment'))
+            for e in topo.elements:
+                if isinstance(e, topdl.Segment) and e.id.fedid == segid:
+                    seg = e
+                    break
+            else:
+                raise service_error(service_error.req, 
+                        "Can't find segment for portal %s" % myname)
+
+            rexp = seg.get_attribute('experiment')
+            rproj, reid = rexp.split("/", 1)
+            rdomain = seg.get_attribute('domain')
+            cfn = "%s/%s.%s.%s%s.gw.conf" % \
+                    (tmpdir, myname, leid, lproj, ldomain)
+            try:
+                f = open(cfn, "w")
+                print >>f, "Active: %s" % active
+                print >>f, "BossName: boss"
+                print >>f, "FsName: fs"
+                print >>f, "EventServerName: event-server%s" % ldomain
+                print >>f, "RemoteEventServerName: event-server%s" % rdomain
+                print >>f, "SeerControl: control.%s.%s%s" % \
+                        (leid.lower(), lproj.lower(), ldomain)
+                print >>f, "Type: %s" % type
+                print >>f, "RemoteExperiment: %s" % rexp
+                print >>f, "LocalExperiment: %s" % lexp
+                print >>f, "RemoteConfigFile: " + \
+                        "/proj/%s/exp/%s/tmp/%s.%s.%s%s.gw.conf" \
+                        % (rproj, reid, peer.lower(), reid.lower(),
+                                rproj.lower(), rdomain)
+                print >>f, "Peer: %s.%s.%s%s" % \
+                        (peer.lower(), reid.lower(), rproj.lower(), rdomain)
+                print >>f, "Pubkeys: /proj/%s/exp/%s/tmp/%s" % \
+                        (lproj, leid, pubkey_base)
+                print >>f, "Privkey: /proj/%s/exp/%s/tmp/%s" % \
+                        (lproj, leid, secretkey_base)
+                f.close()
+            except IOError, e:
+                raise service_error(service_error.internal,
+                        "Can't write protal config %s: %s" % (cfn, e))
+
     def StartSegment(self, req, fid):
         def get_url(url, cf, tmpdir):
@@ -1161 +1214 @@
 
         configs = set(('hosts', 'ssh_pubkey', 'ssh_secretkey'))
+        keys = set(('ssh_pubkey', 'ssh_secretkey'))
 
 
@@ -1200 +1254 @@
             if a['attribute'] in configs:
                 get_url(a['value'], certfile, tmpdir)
+            if a['attribute'] == 'ssh_pubkey':
+                pubkey_base = a['attribute'].rpartition('/')[2]
+            if a['attribute'] == 'ssh_secretkey':
+                secretkey_base = a['attribute'].rpartition('/')[2]
+
+        self.generate_portal_configs(topo, pubkey_base, secretkey_base, tmpdir)
 
         return { 'allocID': req['allocID'] }

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')
+                                            ]
                                         ),
                                     ],