Changeset 328e93f

Timestamp:

Feb 1, 2013 1:25:43 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

17c6d91

Parents:

9a52a80 (diff), 06a2b49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

Files:

• fedd/deter/__init__.py (modified) (1 diff)
• fedd/federation/desktop_access.py (added)
• fedd/federation/deter_impl.py (modified) (2 diffs)
• fedd/federation/emulab_access.py (modified) (1 diff)
• fedd/federation/experiment_control.py (modified) (17 diffs)
• fedd/federation/util.py (modified) (1 diff)
• fedkit/Makefile (modified) (1 diff)
• fedkit/federate.pl (modified) (3 diffs)

fedd/deter/__init__.py

@@ -5 +5 @@
 from ip_allocator import *
 from ip_addr import *
+from topdl_to_route import *

fedd/federation/deter_impl.py

@@ -8 +8 @@
 import deter_internal_access
 import benito_access
+import desktop_access
 import skeleton_access
 
@@ -89 +90 @@
                 elif self.access_type == "benito":
                     self.access = benito_access.access(config, self.auth)
+                elif self.access_type == "desktop":
+                    self.access = desktop_access.access(config, self.auth)
                 elif self.access_type == "skel":
                     self.access = skeleton_access.access(config, self.auth)

fedd/federation/emulab_access.py

@@ -691 +691 @@
         """
         configs = ('hosts', 'ssh_pubkey', 'ssh_secretkey', 
-                'seer_ca_pem', 'seer_node_pem')
+                'seer_ca_pem', 'seer_node_pem', 'route.tgz')
         ename = None
         pubkey_base = None

fedd/federation/experiment_control.py

@@ -44 +44 @@
 from deter import ip_allocator
 from deter import ip_addr
+from deter import topology_to_route_file
 import list_log
 
@@ -137 +138 @@
                 or 'legacy'
         self.auth_dir = config.get('experiment_control', 'auth_dir')
+        self.routing = config.get('experiment_control', 'routing')
         # XXX: document this!
         self.info_cache_limit = \
@@ -1204 +1206 @@
 
         for p, a in attrs:
-            # PNNL Debug
-            self.log.debug("Append auth: %s %s" % (p, a))
             if p and a:
                 # Improperly configured overrides can add bad principals.
@@ -1623 +1623 @@
         """
 
-        # XXX: PNNL debug
-        self.log.debug("calling wrangle software")
         # Copy the rpms and tarfiles to a distribution directory from
         # which the federants can retrieve them
@@ -1637 +1635 @@
         pkgs.update([x.location for e in top.elements for x in e.software])
         try:
-            # XXX: PNNL debug
-            self.log.debug("wrangle software: makedirs")
             os.makedirs(softdir)
-            # XXX: PNNL debug
-            self.log.debug("wrangle software: makedirs success")
         except EnvironmentError, e:
             raise service_error(
@@ -1961 +1955 @@
         Create the ssh keys necessary for interconnecting the portal nodes and
         the global hosts file for letting each segment know about the IP
-        addresses in play.  Save these into the repo.  Add attributes to the
-        autorizer allowing access controllers to download them and return a set
-        of attributes that inform the segments where to find this stuff.  May
+        addresses in play.  If we have computed static routes, copy them into
+        the repo. Save these into the repo.  Add attributes to the autorizer
+        allowing access controllers to download them and return a set of
+        attributes that inform the segments where to find this stuff.  May
         raise service_errors in if there are problems.
         """
@@ -1971 +1966 @@
         gw_pubkey = os.path.join(keydir, gw_pubkey_base)
         gw_secretkey = os.path.join(keydir, gw_secretkey_base)
+        route = os.path.join(tmpdir, 'route.tgz')
 
         try:
@@ -1985 +1981 @@
         # The config file system location
         configdir ="%s%s" % ( self.repodir, configpath)
+        route_conf = os.path.join(configdir, 'route.tgz')
         try:
             os.makedirs(configdir)
@@ -1998 +1995 @@
                     "Cannot write hosts file: %s" % e)
         try:
+            if os.path.exists(route):
+                copy_file(route, route_conf)
+
             copy_file(gw_pubkey, os.path.join(configdir, gw_pubkey_base))
             copy_file(gw_secretkey, os.path.join(configdir, gw_secretkey_base))
@@ -2014 +2014 @@
             (tbparams[tb].allocID, "%s/%s" % (configpath, f)) \
                     for tb in tbparams.keys() \
-                        for f in ("hosts", 'ca.pem', 'node.pem', 
+                        for f in ("hosts", 'ca.pem', 'node.pem', 'route.tgz',
                             gw_secretkey_base, gw_pubkey_base)]))
 
@@ -2044 +2044 @@
                 },
             ]
+        # Add info about static routes if we have some
+        if os.path.exists(route_conf):
+            attrs.append(
+                {
+                    'attribute': 'route.tgz', 
+                    'value': '%s/%s/config/%s' % \
+                            (self.repo_url, expid, 'route.tgz')
+                }
+            )
         return attrs
 
@@ -2170 +2179 @@
                 raise service_error(service_error.req, "No such experiment")
 
+    @staticmethod
+    def needs_route_computation(req):
+        '''
+        Walk the request services looking for a static routing request
+        '''
+        for s in req.get('service', []):
+            if s.get('name', '') == 'static_routing':
+                return True
+        return False
+
+    def compute_static_routes(self, tmpdir, top):
+        '''
+        Compute a set of static routes for the topology.  The result is a file
+        called route.tgz in tmpdir that contains a dinrectory, route, with a
+        file per node in the topology that lists the prefix and router for all
+        the routes in that node's routing table.  Exceptions from the route
+        calculation program and the tar creation call are not caught.
+        '''
+        if self.routing is None:
+            raise service_error(service_error.server, 
+                    'Cannot provide staticroutes, no routing program specified')
+        rg = tempfile.NamedTemporaryFile()
+        outdir = os.path.join(tmpdir, 'route')
+        tarfile = os.path.join(tmpdir, 'route.tgz')
+        topology_to_route_file(top, file=rg)
+        os.mkdir(outdir)
+        try:
+            for cmd in (
+                    [self.routing, '--input', rg.name,'--output', outdir],
+                    ['tar', '-C', tmpdir, '-czf', tarfile, 'route']):
+                subprocess.check_call(cmd)
+        except subprocess.CalledProcessError, e:
+            raise service_error(service_error.internal, 
+                    'Cannot call %s: %s' % (' '.join(cmd), e.returncode))
+        rg.close()
+        shutil.rmtree(outdir)
+
+
     
     def save_federant_information(self, allocated, tbparams, eid, top):
@@ -2279 +2326 @@
             # Assign the IPs
             hosts, ip_allocator = self.allocate_ips_to_topo(top)
+            if self.needs_route_computation(req):
+                self.compute_static_routes(tmpdir, top)
             # Find the testbeds to look up
             tb_hosts = { }
@@ -2284 +2333 @@
             for e in top.elements:
                 if isinstance(e, topdl.Computer):
-                    tb = e.get_attribute('testbed') or 'default'
+                    tb = e.get_attribute('testbed')
+                    # Put nodes not in a testbed into the 'default' testbed if
+                    # 'default' is in the fedd map, the instantiation will
+                    # work.
+                    if tb is None:
+                        tb = 'default'
+                        e.set_attribute('testbed', tb)
                     if tb in tb_hosts: tb_hosts[tb].append(e.name)
                     else: 
@@ -2306 +2361 @@
 
             attrs = self.generate_keys_and_hosts(tmpdir, expid, hosts, tbparams)
-            # XXX: PNNL debug
-            self.log.debug("Back from generate keys")
 
             part = experiment_partition(self.auth, self.store_url, tbmap,
@@ -2313 +2366 @@
             part.add_portals(top, topo, eid, pmasters, tbparams, ip_allocator,
                     connInfo, expid)
-            # XXX: PNNL debug
-            self.log.debug("Back from add portals")
 
             auth_attrs = set()
             # Now get access to the dynamic testbeds (those added above)
             for tb in [ t for t in topo if t not in allocated]:
-                # XXX: PNNL debug
-                self.log.debug("dynamic testbeds %s" %tb)
                 self.get_access(tb, tbparams, fid, masters, tbmap, 
                         expid, expcert_file)
@@ -2331 +2380 @@
                                 for sk in store_keys.split(" ")]))
 
-            # XXX: PNNL debug
-            self.log.debug("done with dynamic testbeds %s" % auth_attrs)
             if auth_attrs:
                 self.append_experiment_authorization(expid, auth_attrs)

fedd/federation/util.py

@@ -218 +218 @@
     while not ok and retries < max_retries:
         try:
-            if log:
-                log.debug('Creating HTTPSConnection: %s' % cf)
             conn = httplib.HTTPSConnection(po.hostname, port=po.port, 
                     cert_file=cf, key_file=cf, timeout=30)
             conn.putrequest('GET', po.path)
             conn.endheaders()
-            if log:
-                log.debug('Connecting')
             response = conn.getresponse()
-            if log:
-                log.debug('Connected')
 
             lf = open("%s/%s" % (destdir, fn), "w")
-            if log:
-                log.debug('initial read')
             buf = response.read(4096)
             while buf:
                 lf.write(buf)
-                if log:
-                    log.debug('loop read')
                 buf = response.read(4096)
             lf.close()

fedkit/Makefile

@@ -3 +3 @@
          config_from_tunnelip.pl active_config.pl combo.pl \
          prep_gateway.pl port_forward.pl setup_bridge.pl import_key.pl \
-         gated_routing.pl start_seer.pl ospf_routing.pl quagga_routing.pl
+         gated_routing.pl start_seer.pl ospf_routing.pl quagga_routing.pl \
+         static_routing.pl
 
 LIBRARIES=gateway_lib.pm 

fedkit/federate.pl

@@ -88 +88 @@
 
     foreach my $fn ("seer.conf", "client.conf", "userconf", "hosts",
-            "ca.pem", "node.pem") {
+            "ca.pem", "node.pem", "route.tgz") {
         copy("$shared_config_dir/$fn", $local_config_dir )
             if -e "$shared_config_dir/$fn";
     }
+    # If there are static routes, unpack them
+    system("tar -C $local_config_dir -xzf $local_config_dir/route.tgz")
+        if -e "$local_config_dir/route.tgz";
 
     # Copy seer authorization files into the location that standard SEER
@@ -169 +172 @@
 
 if ($uname =~ /Linux/ ) {
-    system("$perl /usr/local/federation/bin/gated_routing.pl")
-        if -r "/usr/local/federation/bin/gated_routing.pl";
+    system("$perl /usr/local/federation/bin/static_routing.pl")
+        if -r "/usr/local/federation/bin/static_routing.pl";
+    if ($?) {
+        system("$perl /usr/local/federation/bin/gated_routing.pl")
+            if -r "/usr/local/federation/bin/gated_routing.pl";
+        }
     if ($?) {
         system("$perl /usr/local/federation/bin/quagga_routing.pl")
@@ -177 +184 @@
 }
 elsif ($uname =~/FreeBSD/ ) {
-    # FreeBSD needs to have ospfs installed and a router config created and
-    # run.
-    system("$perl /usr/local/federation/bin/ospf_routing.pl")
-        if -r "/usr/local/federation/bin/ospf_routing.pl";
+    system("$perl /usr/local/federation/bin/static_routing.pl")
+        if -r "/usr/local/federation/bin/static_routing.pl";
+    if ($?) {
+        # FreeBSD needs to have ospfs installed and a router config created and
+        # run.
+        system("$perl /usr/local/federation/bin/ospf_routing.pl")
+            if -r "/usr/local/federation/bin/ospf_routing.pl";
+    }
 }