- now using event_objects to log affected objects

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

diff --git a/PLC/Methods/AddSlice.py b/PLC/Methods/AddSlice.py
index 76dc24d..cbb0d85 100644 (file)
--- a/PLC/Methods/AddSlice.py
+++ b/PLC/Methods/AddSlice.py
@@ -4,12 +4,15 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Slices import Slice, Slices
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 from PLC.Sites import Site, Sites
 
+can_update = lambda (field, value): field in \
+             ['name', 'instantiation', 'url', 'description', 'max_nodes']
+
 class AddSlice(Method):
     """
-    Adds a new slice. Any fields specified in optional_vals are used,
+    Adds a new slice. Any fields specified in slice_fields are used,
     otherwise defaults are used.
 
     Valid slice names are lowercase and begin with the login_base
@@ -26,26 +29,23 @@ class AddSlice(Method):
 
     roles = ['admin', 'pi']
 
-    can_update = lambda (field, value): field in \
-                 ['instantiation', 'url', 'description', 'max_nodes']
-    update_fields = dict(filter(can_update, Slice.fields.items()))
+    slice_fields = dict(filter(can_update, Slice.fields.items()))
 
     accepts = [
-        PasswordAuth(),
-        Slice.fields['name'],
-        update_fields
+        Auth(),
+        slice_fields
         ]
 
     returns = Parameter(int, 'New slice_id (> 0) if successful')
 
-    def call(self, auth, name, optional_vals = {}):
-        if filter(lambda field: field not in self.update_fields, optional_vals):
-            raise PLCInvalidArgument, "Invalid field specified"
+    def call(self, auth, slice_fields):
+        slice_fields = dict(filter(can_update, slice_fields.items()))
 
         # 1. Lowercase.
         # 2. Begins with login_base (only letters).
         # 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_]+$'
         if not name or \
            not re.match(good_name, name):
@@ -53,22 +53,25 @@ class AddSlice(Method):
 
         # Get associated site details
         login_base = name.split("_")[0]
-        sites = Sites(self.api, [login_base]).values()
+        sites = Sites(self.api, [login_base])
         if not sites:
-            raise PLCInvalidArgument, "Invalid slice prefix"
+            raise PLCInvalidArgument, "Invalid slice prefix %s in %s"%(login_base,name)
         site = sites[0]
 
         if 'admin' not in self.caller['roles']:
             if site['site_id'] not in self.caller['site_ids']:
-                raise PLCPermissionDenied, "Slice prefix must be the same as the login_base of one of your sites"
+                raise PLCPermissionDenied, "Slice prefix %s must be the same as the login_base of one of your sites"%login_base
 
         if len(site['slice_ids']) >= site['max_slices']:
-            raise PLCInvalidArgument, "Site has reached its maximum allowable slice count"
+            raise PLCInvalidArgument, "Site %s has reached (%d) its maximum allowable slice count (%d)"%(site['name'],
+                                                                                                         len(site['slice_ids']),
+                                                                                                         site['max_slices'])
 
-        slice = Slice(self.api, optional_vals)
+        slice = Slice(self.api, slice_fields)
         slice['creator_person_id'] = self.caller['person_id']
-        slice['name'] = name
         slice['site_id'] = site['site_id']
         slice.sync()
 
+       self.event_objects = {'Slice': [slice['slice_id']]}
+
         return slice['slice_id']