From: Tony Mack <tmack@cs.princeton.edu>
Date: Thu, 26 Apr 2007 18:25:56 +0000 (+0000)
Subject: - allow capital letters in slice names
X-Git-Tag: PLCAPI-4.2-0~140
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=e9535e3a0eccea0164d15150afe3fafab532fb82;p=plcapi.git

- allow capital letters in slice names
---

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 9567c09..5642519 100644
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -42,11 +42,11 @@ class AddSlice(Method):
         slice_fields = dict(filter(can_update, slice_fields.items()))
 
         # 1. Lowercase.
-        # 2. Begins with login_base (only letters).
+        # 2. Begins with login_base (letters or numbers).
         # 3. Then single underscore after login_base.
         # 4. Then letters, numbers, or underscores.
         name = slice_fields['name']
-        good_name = r'^[a-z0-9]+_[a-z0-9_]+$'
+        good_name = r'^[a-z0-9]+_[a-zA-Z0-9_]+$'
         if not name or \
            not re.match(good_name, name):
             raise PLCInvalidArgument, "Invalid slice name"
diff --git a/PLC/Slices.py b/PLC/Slices.py
index c8f6e81..d3b6f78 100644
--- a/PLC/Slices.py
+++ b/PLC/Slices.py
@@ -61,7 +61,7 @@ class Slice(Row):
         # 2. Begins with login_base (letters or numbers).
         # 3. Then single underscore after login_base.
         # 4. Then letters, numbers, or underscores.
-        good_name = r'^[a-z0-9]+_[a-z0-9_]+$'
+        good_name = r'^[a-z0-9]+_[a-zA-Z0-9_]+$'
         if not name or \
            not re.match(good_name, name):
             raise PLCInvalidArgument, "Invalid slice name"