Changeset f725eda for fedd/federation

Timestamp:

Nov 8, 2013 4:47:29 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

6b439fa

Parents:

27c5f3e

Message:

Allow risky access - need to be made tighter

File:

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

fedd/federation/emulab_access.py

@@ -474 +474 @@
                 return ""
             else:
-                return 'tb-fix-node ${%s} %s' % (topdl.to_tcl_name(e.name), fn)
+                return 'tb-fix-node ${%s} %s\n' % (topdl.to_tcl_name(e.name), fn)
+
+        def output_external_access(e):
+            '''
+            Allow nodes that have explicit external access requests attached to
+            have external access.  This will be replaced by a real risky
+            experiment filter.
+            '''
+            if not isinstance(e, topdl.Computer): return ""
+            ex = e.get_attribute('containers:external')
+            if ex is None:
+                return ""
+            else:
+                return 'tb-allow-external ${%s}\n' % topdl.to_tcl_name(e.name)
 
         # Weed out the things we aren't going to instantiate: Segments, portal
@@ -518 +531 @@
 
         # Customize the ns2 output for local portal commands and images
-        filters = [output_fixed_filter]
+        filters = [output_fixed_filter, output_external_access]
 
         if self.dragon_endpoint: