- allow capital letters in slice names

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 9567c09..5642519 100644 (file)
--- 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 (file)
--- 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"