Changeset 9b3627e for fedd/federation/emulab_access.py

Timestamp:

Mar 9, 2010 1:08:05 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

4e9719b

Parents:

c2c153b

Message:

SEER support

File:

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

fedd/federation/emulab_access.py

@@ -56 +56 @@
         Initializer.  Pulls parameters out of the ConfigParser's access section.
         """
+
+        def software_list(v):
+            l = [ ]
+            if v:
+                ps = v.split(" ")
+                while len(ps):
+                    loc, file = ps[0:2]
+                    del ps[0:2]
+                    l.append((loc, file))
+            return l
+
 
         # Make sure that the configuration is in place
@@ -73 +84 @@
         self.userconfcmd = config.get("access","userconfcmd")
         self.userconfurl = config.get("access","userconfurl")
+        self.federation_software = config.get("access", "federation_software")
+        self.portal_software = config.get("access", "portal_software")
         self.ssh_privkey_file = config.get("access","ssh_privkey_file")
         self.ssh_pubkey_file = config.get("access","ssh_pubkey_file")
@@ -79 +92 @@
         self.cleanup = not config.getboolean("access", "leave_tmpfiles")
         self.access_type = config.get("access", "type")
+   
+        self.federation_software = software_list(self.federation_software)
+        self.portal_software = software_list(self.portal_software)
 
         self.access_type = self.access_type.lower()
@@ -968 +984 @@
                 'userconfig': client_null,
             }
+
+        def server_port(f, s):
+            p = urlparse(s.get('server', 'http://localhost'))
+            print >>f, 'port: remote:%s:%s:%s' % (p.port, p.hostname, p.port) 
+
+        def server_null(f,s): pass
+
+        def server_seer(f, s):
+            print >>f, 'seer: true'
+
+        server_service_out = {
+                'SMB': server_port,
+                'tmcd': server_port,
+                'userconfig': server_null,
+                'seer': server_seer,
+            }
         # XXX: end un hardcode this
 
@@ -1006 +1038 @@
                         for s in [s for s in services \
                                 if s.get('name', "") in self.imports]:
-                            p = urlparse(s.get('server', 'http://localhost'))
-                            print >>f, 'port: remote:%s:%s:%s' % \
-                                    (p.port, p.hostname, p.port)
+                            server_service_out[s['name']](f, s)
 
                 if tunnelconfig:
@@ -1026 +1056 @@
             
             # XXX: This little seer config file needs to go away.
-            if not seer_out:
-                try:
-                    seerfn = "%s/seer.conf" % tmpdir
-                    f = open(seerfn, "w")
-                    if not master:
-                        print >>f, "ControlNode: control.%s.%s%s" % \
-                            (meid.lower(), mproj.lower(), mdomain)
-                    print >>f, "ExperimentID: %s" % mexp
-                    f.close()
-                except IOError, e:
-                    raise service_error(service_error.internal, 
-                            "Can't write seer.conf: %s" %e)
-                seer_out = True
+            #if not seer_out:
+                #try:
+                    #seerfn = "%s/seer.conf" % tmpdir
+                    #f = open(seerfn, "w")
+                    #if not master:
+                        #print >>f, "ControlNode: control.%s.%s%s" % \
+                            #(meid.lower(), mproj.lower(), mdomain)
+                    #print >>f, "ExperimentID: %s" % mexp
+                    #f.close()
+                #except IOError, e:
+                    #raise service_error(service_error.internal, 
+                            #"Can't write seer.conf: %s" %e)
+                #seer_out = True
 
             if not client_out and type in ('control', 'both'):
@@ -1050 +1080 @@
                                 s.get('visibility','') == 'import':
                             client_service_out[s['name']](f, s)
-                    # Does seer need this? (evidently so)
+                    # Seer uses this?
                     print >>f, "ExperimentID: %s/%s" % (mproj, meid)
                     f.close()
@@ -1105 +1135 @@
                 return e.name[0] not in self.nodes
 
+        def add_kit(e, kit):
+            """
+            Add a Software object created from the list of (install, location)
+            tuples passed as kit  to the software attribute of an object e.  We
+            do this enough to break out the code, but it's kind of a hack to
+            avoid changing the old tuple rep.
+            """
+
+            s = [ topdl.Software(install=i, location=l) for i, l in kit]
+
+            if isinstance(e.software, list): e.software.extend(s)
+            else: e.software = s 
+
+
         t = topo.clone()
 
@@ -1149 +1193 @@
             if isinstance(e, topdl.Segment):
                 t.elements.remove(e)
-            # Fix software paths
-            for s in getattr(e, 'software', []):
-                s.location = re.sub("^.*/", softdir, s.location)
             if isinstance(e, topdl.Computer):
+                add_kit(e, self.federation_software)
                 if e.get_attribute('portal') and gate_cmd:
+                    # Add local portal support software
+                    add_kit(e, self.portal_software)
                     # Portals never have a user-specified start command
                     e.set_attribute('startup', gate_cmd)
@@ -1167 +1211 @@
                 e.interface = [i for i in e.interface \
                         if not i.get_attribute('portal') or i.name in dinf ]
+            # Fix software paths
+            for s in getattr(e, 'software', []):
+                s.location = re.sub("^.*/", softdir, s.location)
 
         t.substrates = [ s.clone() for s in t.substrates ]
@@ -1368 +1415 @@
                 get_url(s, certfile, softdir)
 
+            # Copy local portal node software to the tempdir
+            for l, f in self.portal_software:
+                base = os.path.basename(f)
+                copy_file(f, "%s/%s" % (softdir, base))
+
             for a in attrs:
                 if a['attribute'] in configs: