Changeset 8fbef04 for fedd/federation/xmlrpc_emulab_segment.py

Timestamp:

Mar 10, 2014 5:25:42 PM (10 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

d75005b

Parents:

a2ca699

Message:

Shared NAT integrated

File:

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

fedd/federation/xmlrpc_emulab_segment.py

@@ -141 +141 @@
         return state
 
-    def make_null_experiment(self, pid, eid, tmpdir, gid=None):
+    def make_null_experiment(self, pid, eid, tmpdir, gid=None, ns_str=None):
         """
         Create a null copy of the experiment so that we capture any logs there
         if the modify fails.  Emulab software discards the logs from a failed
-        startexp.
-        """
+        startexp.  If ns_str is given, use that to construct the null
+        experiment.
+        """
+
+        if ns_str is None:
+            ns_str = self.null
 
         if self.debug:
@@ -157 +161 @@
                     'proj': pid,
                     'exp': eid, 
-                    'nsfilestr': self.null,
+                    'nsfilestr': ns_str,
                     'batch': False,
                     'idleswap': 0,