Changeset 05c41f5 for fedd/federation/emulab_access.py

Timestamp:

Oct 7, 2011 5:29:41 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

58e5a4f

Parents:

743a102

Message:

Terminate nonce experiments #36

File:

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

fedd/federation/emulab_access.py

@@ -933 +933 @@
         user = None
         alloc_log = None
+        nonce_experiment = False
         vchars_re = '[^' + string.ascii_letters + string.digits  + '-]'
 
@@ -973 +974 @@
             for i in range(0,5):
                 ename += random.choice(string.ascii_letters)
+            nonce_experiment = True
             self.log.warn("No experiment name or suggestion too long: " + \
                     "picked one randomly: %s" % ename)
@@ -988 +990 @@
             user = self.allocation[aid].get('user', None)
             self.allocation[aid]['experiment'] = ename
+            self.allocation[aid]['nonce'] = nonce_experiment
             self.allocation[aid]['log'] = [ ]
             # Create a logger that logs to the experiment's state object as
@@ -1162 +1165 @@
             user = self.allocation[aid].get('user', None)
             ename = self.allocation[aid].get('experiment', None)
+            nonce = self.allocation[aid].get('nonce', False)
         else:
             proj = None
             user = None
             ename = None
+            nonce = False
         self.state_lock.release()
 
@@ -1183 +1188 @@
         stopper = self.stop_segment(keyfile=self.ssh_privkey_file,
                 debug=self.create_debug, boss=self.boss, cert=self.xmlrpc_cert)
-        stopper(self, user, proj, ename, gid)
+        stopper(self, user, proj, ename, gid, nonce)
         return { 'allocID': req['allocID'], 'proof': proof.to_dict() }