Changeset 69692a9 for fedd/federation/emulab_access.py

Timestamp:

Sep 21, 2009 6:48:12 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:

ae0f69a

Parents:

adcbdaf

Message:

Looks like Dragon is being called correctly. Internals remain a bit messy.

File:

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

fedd/federation/emulab_access.py

@@ -69 +69 @@
         self.ssh_privkey_file = config.get("access","ssh_privkey_file")
         self.create_debug = config.getboolean("access", "create_debug")
+        self.cleanup = not config.getboolean("access", "leave_tmpfiles")
         self.access_type = config.get("access", "type")
 
@@ -915 +916 @@
 
     def generate_ns2(self, topo, expfn, softdir, master):
+        def dragon_commands(e):
+            s = ""
+            if isinstance(e, topdl.Computer):
+                for i in e.interface:
+                    vlan = i.get_attribute('dragon_vlan')
+                    if vlan:
+                        type = i.get_attribute('dragon_type')
+                        ip = i.get_attribute('ip4_address')
+                        if type == 'link':
+                            s = ("tb-allow-external $%s dragonportal " + \
+                                    "ip %s vlan %s\n") % \
+                                    (topdl.to_tcl_name(e.name[0]), ip, vlan)
+                        elif type == 'lan':
+                            s = ("tb-allow-external $%s dragonportal " + \
+                                    "ip %s vlan %s usurp %s\n") % \
+                                    (topdl.to_tcl_name(e.name[0]), ip, vlan,
+                                        i.substrate[0])
+                        else:
+                            raise service_error(service_error_internal,
+                                    "Unknown DRAGON type %s" % type)
+            return s
+
+        def not_dragon(e):
+            return all([not i.get_attribute('dragon_vlan') \
+                    for i in e.interface])
+
         t = topo.clone()
 
@@ -925 +952 @@
             if isinstance(e, topdl.Computer):
                 e.interface = [i for i in e.interface \
-                        if not i.get_attribute('portal')]
-        t.substrates = [ s for s in t.substrates \
-                if not s.get_attribute('portal')]
+                        if not i.get_attribute('portal') or \
+                            i.get_attribute('dragon_vlan')]
+        t.substrates = [ s.clone() for s in t.substrates ]
+        #t.substrates = [ s for s in t.substrates \
+        #       if not s.get_attribute('portal')]
         t.incorporate_elements()
 
@@ -941 +970 @@
         else:cmdname = 'SlaveConnectorCmd'
 
+        if self.attrs.has_key('dragon'):
+            add_filter = not_dragon
+            filters.append(dragon_commands)
+        else:
+            add_filter = None
+
         if self.attrs.has_key(cmdname):
             filters.append(topdl.generate_portal_command_filter(
-                self.attrs.get(cmdname)))
+                self.attrs.get(cmdname), add_filter=add_filter))
 
         if self.attrs.has_key('connectorImage'):
@@ -1086 +1121 @@
             err = e
 
-        self.log.debug("[StartSegment]: removing %s" % tmpdir)
         # Walk up tmpdir, deleting as we go
-        for path, dirs, files in os.walk(tmpdir, topdown=False):
-            for f in files:
-                os.remove(os.path.join(path, f))
-            for d in dirs:
-                os.rmdir(os.path.join(path, d))
-        os.rmdir(tmpdir)
+        if self.cleanup:
+            self.log.debug("[StartSegment]: removing %s" % tmpdir)
+            for path, dirs, files in os.walk(tmpdir, topdown=False):
+                for f in files:
+                    os.remove(os.path.join(path, f))
+                for d in dirs:
+                    os.rmdir(os.path.join(path, d))
+            os.rmdir(tmpdir)
+        else:
+            self.log.debug("[StartSegment]: not removing %s" % tmpdir)
 
         if rv: