Changeset 262328f

Timestamp:

Dec 3, 2010 10:49:56 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

9252414

Parents:

b7a61ac

Message:

Clean up user proposed experiment names that DETER/Emulab don't like.

Fixes #8

File:

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

fedd/federation/emulab_access.py

@@ -928 +928 @@
         user = None
         alloc_log = None
+        vchars_re = '[^' + string.ascii_letters + string.digits  + '-]'
 
         for a in attrs:
@@ -946 +947 @@
                 ename = a['value']
 
-        if not ename:
+        if ename:
+            # Clean up the experiment name so that emulab will accept it.
+            ename = re.sub(vchars_re, '-', ename)
+
+        else:
             ename = ""
             for i in range(0,5):