Changeset b6a6206 for fedd/federation/emulab_access.py

Timestamp:

Oct 6, 2011 3:58:02 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

3df9b33

Parents:

2933343 (diff), f3898f7 (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.

Message:

Merge branch 'master' of ​git://fedd.deterlab.net/fedd

File:

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

fedd/federation/emulab_access.py

@@ -934 +934 @@
         vchars_re = '[^' + string.ascii_letters + string.digits  + '-]'
 
+        self.state_lock.acquire()
+        if aid in self.allocation:
+            proj = self.allocation[aid].get('project', None)
+            if not proj: 
+                proj = self.allocation[aid].get('sproject', None)
+        self.state_lock.release()
+
+        if not proj:
+            raise service_error(service_error.internal, 
+                    "Can't find project for %s" %aid)
+
         for a in attrs:
             if a['attribute'] in configs:
@@ -951 +962 @@
                 ename = a['value']
 
-        # Names longer than the emulab max are discarder
-        if ename and len(ename) <= self.max_name_len:
+        # Names longer than the emulab max are discarded
+        # Projects with a group require nonce experiment names as well
+        if ename and len(ename) <= self.max_name_len and '/' not in proj:
             # Clean up the experiment name so that emulab will accept it.
             ename = re.sub(vchars_re, '-', ename)
@@ -973 +985 @@
         self.state_lock.acquire()
         if aid in self.allocation:
-            proj = self.allocation[aid].get('project', None)
-            if not proj: 
-                proj = self.allocation[aid].get('sproject', None)
             user = self.allocation[aid].get('user', None)
             self.allocation[aid]['experiment'] = ename
@@ -992 +1001 @@
             self.write_state()
         self.state_lock.release()
-
-        if not proj:
-            raise service_error(service_error.internal, 
-                    "Can't find project for %s" %aid)
 
         if not user:
@@ -1092 +1097 @@
                             certfile, tmpdir)
 
+            if '/' in proj: proj, gid = proj.split('/')
+            else: gid = None
+
+
             # Set up userconf and seer if needed
             self.configure_userconf(services, tmpdir)
@@ -1109 +1118 @@
                     debug=self.create_debug, log=alloc_log, boss=self.boss,
                     cert=self.xmlrpc_cert)
-            rv = starter(self, ename, proj, user, expfile, tmpdir)
+            rv = starter(self, ename, proj, user, expfile, tmpdir, gid=gid)
         except service_error, e:
             err = e
@@ -1161 +1170 @@
             raise service_error(service_error.internal, 
                     "Can't find project for %s" % aid)
+        else:
+            if '/' in proj: proj, gid = proj.split('/')
+            else: gid = None
 
         if not user:
@@ -1170 +1182 @@
         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)
+        stopper(self, user, proj, ename, gid)
         return { 'allocID': req['allocID'], 'proof': proof.to_dict() }