Changeset 1da6a23

Timestamp:

Sep 4, 2009 5:04:07 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:

5ae3857

Parents:

f5ae004

Message:

cahekpoint: swaps in again!

Location:

fedd/federation

Files:

• access.py (modified) (8 diffs)
• experiment_control.py (modified) (3 diffs)
• topdl.py (modified) (4 diffs)

fedd/federation/access.py

@@ -10 +10 @@
 from threading import *
 import subprocess
+import signal
 import time
 
@@ -1110 +1111 @@
 
         seer_out = False
+        client_out = False
         for p in [ e for e in topo.elements \
                 if isinstance(e, topdl.Computer) and e.get_attribute('portal')]:
@@ -1120 +1122 @@
             mproj, meid = mexp.split("/", 1)
             mdomain = e.get_attribute('masterdomain')
+            muser = e.get_attribute('masteruser') or 'root'
+            smbshare = e.get_attribute('smbshare') or 'USERS'
             scriptdir = e.get_attribute('scriptdir')
             active = e.get_attribute('active')
@@ -1136 +1140 @@
             rdomain = seg.get_attribute('domain')
             cfn = "%s/%s.%s.%s%s.gw.conf" % \
-                    (tmpdir, myname, leid, lproj, ldomain)
+                    (tmpdir, myname.lower(), leid.lower(),
+                            lproj.lower(), ldomain.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"
@@ -1155 +1162 @@
                 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" % \
                         (lproj, leid, pubkey_base)
-                print >>f, "Privkey: /proj/%s/exp/%s/tmp/%s" % \
+                print >>f, "Privkeys: /proj/%s/exp/%s/tmp/%s" % \
                         (lproj, leid, secretkey_base)
                 f.close()
@@ -1179 +1187 @@
                 seer_out = True
 
-
-    def generate_client_conf(self, user, proj, eid, tmpdir):
-        try:
-            f = open("%s/client.conf" % tmpdir, "w")
-            if self.attrs.has_key('SMBshare'):
-                print >>f, "SMBshare: %s" % self.attrs['SMBshare']
-            print >>f, "ProjectUser: %s" % user
-            print >>f, "ProjectName: %s" % proj
-            print >>f, "ExperimentID: %s/%s" % (proj, eid)
-            f.close()
-        except IOError, e:
-            raise service_error(service_error.internal,
-                    "Cannot write client.conf: %s" %s)
+            if not client_out and type in ('control', 'both'):
+                try:
+                    f = open("%s/client.conf" % tmpdir, "w")
+                    print >>f, "ControlGateway: %s.%s.%s%s" % \
+                        (myname.lower(), leid.lower(), lproj.lower(),
+                                ldomain.lower())
+                    print >>f, "SMBshare: %s" % smbshare
+                    print >>f, "ProjectUser: %s" % muser
+                    print >>f, "ProjectName: %s" % mproj
+                    print >>f, "ExperimentID: %s/%s" % (mproj, meid)
+                    f.close()
+                except IOError, e:
+                    raise service_error(service_error.internal,
+                            "Cannot write client.conf: %s" %s)
+                client_out = True
+
+
 
     def generate_ns2(self, topo, expfn, softdir, master):
@@ -1214 +1226 @@
                 s.location = re.sub("^.*/", softdir, s.location)
 
-
         # Customize the ns2 output for local portal commands and images
         filters = []
@@ -1340 +1351 @@
         self.generate_ns2(topo, expfile, 
                 "/proj/%s/software/%s/" % (proj, ename), master)
-        self.generate_client_conf(user, proj, ename, tmpdir)
         starter = self.start_segment(keyfile=self.ssh_privkey_file, debug=False)
         starter(self, ename, proj, user, expfile, tmpdir)

fedd/federation/experiment_control.py

@@ -2619 +2619 @@
                         ddomain = tbparams[dt].get('domain', ".example.com")
                         mdomain = tbparams[master].get('domain', '.example.com')
+                        muser = tbparams[master].get('user', 'root')
+                        smbshare = tbparams[master].get('smbshare', 'USERS')
                         # XXX: active and type need to be unkludged
                         active = ("%s" % (st == master))
@@ -2661 +2663 @@
                                             ('masterexperiment', "%s/%s" % \
                                                     (mproject, eid)),
+                                            ('masteruser', muser),
+                                            ('smbshare', smbshare),
                                             ('experiment', "%s/%s" % \
                                                     (sproject, eid)),
@@ -2677 +2681 @@
                                         attribute=[ 
                                             topdl.Attribute(
-                                                attribute='ip4_addreess', 
+                                                attribute='ip4_address', 
                                                 value=tbs[dt]
                                             )

fedd/federation/topdl.py

@@ -613 +613 @@
 
 
-def topology_to_ns2(t, filters=[]):
+def topology_to_ns2(t, filters=[], routing="Session"):
     out = """
 set ns [new Simulator]
@@ -668 +668 @@
             for i in s.interfaces:
                 e = i.element
-                ip = e.get_attribute("ip4_address")
+                ip = i.get_attribute("ip4_address")
                 if ip:
-                    out += "tb-set-ip-lan $%s $%s %s\n" % (e.name, name, ip)
+                    out += "tb-set-ip-lan $%s $%s %s\n" % \
+                            (to_tcl(e.name[0]), name, ip)
                 if i.capacity and i.capacity.rate != s.capacity.rate:
                     out += "tb-set-node-lan-bandwidth $%s $%s %fkb\n" % \
@@ -679 +680 @@
                 iloss = i.get_attribute('loss')
                 if loss and iloss != loss :
-                    out += "tb-set-node-lan-loss $%s $%s %f" % \
+                    out += "tb-set-node-lan-loss $%s $%s %f\n" % \
                             (to_tcl_name(e.name[0]), name, float(loss))
             out+= "\n"
@@ -712 +713 @@
                             % (name, to_tcl_name(i.element.name[0]),
                                     delay, cap, loss)
+                ip = i.get_attribute('ip4_address')
+                if ip:
+                    out += "tb-set-ip-link $%s $%s %s\n" % \
+                            (to_tcl_name(i.element.name[0]), name, ip)
             out+= "\n"
         for f in filters:
             out+= f(s)
+    out+="$ns rtproto %s" % routing
     out+="""
 $ns run