Changeset 58e5a4f for fedd/federation/emulab_access.py
- Timestamp:
- Oct 7, 2011 5:30:13 PM (13 years ago)
- Branches:
- compt_changes, info-ops, master
- Children:
- 451fb96
- Parents:
- 05c41f5 (diff), 1fed67b (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fedd/federation/emulab_access.py
r1fed67b r58e5a4f 933 933 user = None 934 934 alloc_log = None 935 nonce_experiment = False 935 936 vchars_re = '[^' + string.ascii_letters + string.digits + '-]' 936 937 … … 973 974 for i in range(0,5): 974 975 ename += random.choice(string.ascii_letters) 976 nonce_experiment = True 975 977 self.log.warn("No experiment name or suggestion too long: " + \ 976 978 "picked one randomly: %s" % ename) … … 988 990 user = self.allocation[aid].get('user', None) 989 991 self.allocation[aid]['experiment'] = ename 992 self.allocation[aid]['nonce'] = nonce_experiment 990 993 self.allocation[aid]['log'] = [ ] 991 994 # Create a logger that logs to the experiment's state object as … … 1162 1165 user = self.allocation[aid].get('user', None) 1163 1166 ename = self.allocation[aid].get('experiment', None) 1167 nonce = self.allocation[aid].get('nonce', False) 1164 1168 else: 1165 1169 proj = None 1166 1170 user = None 1167 1171 ename = None 1172 nonce = False 1168 1173 self.state_lock.release() 1169 1174 … … 1183 1188 stopper = self.stop_segment(keyfile=self.ssh_privkey_file, 1184 1189 debug=self.create_debug, boss=self.boss, cert=self.xmlrpc_cert) 1185 stopper(self, user, proj, ename, gid )1190 stopper(self, user, proj, ename, gid, nonce) 1186 1191 return { 'allocID': req['allocID'], 'proof': proof.to_dict() }
Note: See TracChangeset
for help on using the changeset viewer.