Changeset 0297248

Timestamp:

Feb 10, 2010 10:33:53 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

641bb66

Parents:

bbd0039

Message:

Generate configuration files for the new format of gateway nodes. Also insert
the startcmds in this module. The experiment countroller shouldn't be doing
it.

File:

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

fedd/federation/emulab_access.py

@@ -852 +852 @@
             rproj, reid = rexp.split("/", 1)
             rdomain = seg.get_attribute('domain')
-            cfn = "%s/%s.%s.%s%s.gw.conf" % \
-                    (tmpdir, myname.lower(), leid.lower(),
-                            lproj.lower(), ldomain.lower())
+            cfn = "%s/%s.gw.conf" % (tmpdir, myname.lower())
             tunnelconfig = self.attrs.has_key('TunnelCfg')
             try:
                 f = open(cfn, "w")
-                print >>f, "Active: %s" % active
-                print >>f, "TunnelCfg: %s" % tunnelconfig
-                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" % \
+                if active == 'True':
+                    print >>f, "active: %s" % active
+                    if type in ('control', 'both'):
+                        print >>f, 'port: remote:139:fs:139'
+                        print >>f, 'port: remote:7777:boss:7777'
+                        print >>f, 'port: remote:16606:control:16606'
+
+                if tunnelconfig:
+                    print >>f, "tunnelip: %s" % tunnelconfig
+                print >>f, "seercontrol: control.%s.%s%s" % \
                         (meid.lower(), mproj.lower(), mdomain)
-                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)
                 if is_ip:
-                    print >>f, "Peer: %s" % peer
+                    print >>f, "peer: %s" % peer
                 else:
-                    print >>f, "Peer: %s.%s.%s%s" % \
+                    print >>f, "peer: %s.%s.%s%s" % \
                             (peer.lower(), reid.lower(), 
                                     rproj.lower(), rdomain)
-                print >>f, "RemoteScriptDir: %s" % scriptdir
-                print >>f, "Pubkeys: /proj/%s/exp/%s/tmp/%s" % \
+                print >>f, "ssh_pubkey: /proj/%s/exp/%s/tmp/%s" % \
                         (lproj, leid, pubkey_base)
-                print >>f, "Privkeys: /proj/%s/exp/%s/tmp/%s" % \
+                print >>f, "ssh_privkey: /proj/%s/exp/%s/tmp/%s" % \
                         (lproj, leid, secretkey_base)
                 f.close()
@@ -919 +912 @@
                             "Cannot write client.conf: %s" %s)
                 client_out = True
-
 
 
@@ -964 +956 @@
         t.incorporate_elements()
 
-        # Localize the software locations
+        if master: cmdname = 'MasterConnectorStartCmd'
+        else:cmdname = 'SlaveConnectorStartCmd'
+
+        # Localize the software locations and add
         for e in t.elements:
             for s in getattr(e, 'software', []):
                 s.location = re.sub("^.*/", softdir, s.location)
+            if isinstance(e, topdl.Computer) and e.get_attribute('portal'):
+                e.set_attribute('startup', self.attrs.get(cmdname))
+
 
         # Customize the ns2 output for local portal commands and images