Interfaces can handle tags through Add/Get/Update

[plcapi.git] / PLC / Methods / AddSlice.py

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 9cce2b0..9b7e875 100644 (file)
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -1,3 +1,4 @@
+# $Id$
 import re
 
 from PLC.Faults import *
@@ -38,16 +39,15 @@ class AddSlice(Method):
 
     returns = Parameter(int, 'New slice_id (> 0) if successful')
 
-
     def call(self, auth, slice_fields):
         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-z]+_[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"
@@ -68,11 +68,14 @@ class AddSlice(Method):
                                                                                                          len(site['slice_ids']),
                                                                                                          site['max_slices'])
 
+       if not site['enabled']:
+           raise PLCInvalidArgument, "Site %s is disabled can cannot create slices" % (site['name'])
+        
         slice = Slice(self.api, slice_fields)
         slice['creator_person_id'] = self.caller['person_id']
         slice['site_id'] = site['site_id']
         slice.sync()
 
-       self.object_ids = [slice['slice_id']]
+       self.event_objects = {'Slice': [slice['slice_id']]}
 
         return slice['slice_id']